Minor fix and improvements in builtin tp_descrget impls, minor fix in slot_fuzzer.py

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CFieldBuiltins.java

@@ -113,6 +113,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.strings.InternalByteArray;
 import com.oracle.truffle.api.strings.TruffleString;
 
@@ -177,10 +178,11 @@ abstract static class GetNode extends DescrGetBuiltinNode {
         @Specialization
         static Object doit(CFieldObject self, Object inst, @SuppressWarnings("unused") Object type,
                         @Bind("this") Node inliningTarget,
+                        @Cached InlinedConditionProfile instIsNoValueProfile,
                         @Cached PyCDataGetNode pyCDataGetNode,
                         @Cached PyTypeCheck pyTypeCheck,
                         @Cached PRaiseNode.Lazy raiseNode) {
-            if (inst == PNone.NO_VALUE) {
+            if (instIsNoValueProfile.profile(inliningTarget, inst == PNone.NO_VALUE)) {
                 return self;
             }
             if (!pyTypeCheck.isCDataObject(inliningTarget, inst)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/functools/LruCacheWrapperBuiltins.java

@@ -584,8 +584,10 @@ abstract static class GetNode extends DescrGetBuiltinNode {
 
         @Specialization
         static Object getmethod(LruCacheObject self, Object obj, @SuppressWarnings("unused") Object type,
+                        @Bind("this") Node inliningTarget,
+                        @Cached InlinedConditionProfile objIsNoneProfile,
                         @Cached PythonObjectFactory factory) {
-            if (obj instanceof PNone) {
+            if (objIsNoneProfile.profile(inliningTarget, obj instanceof PNone)) {
                 return self;
             }
             return factory.createMethod(obj, self);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/MemberDescriptorBuiltins.java

@@ -126,7 +126,7 @@ static Object doNone(@SuppressWarnings("unused") Object descr, @SuppressWarnings
             return descr;
         }
 
-        @Specialization(guards = "!isNone(obj)")
+        @Specialization(guards = "!isNoValue(obj)")
         static Object doGetSetDescriptor(VirtualFrame frame, GetSetDescriptor descr, Object obj, @SuppressWarnings("unused") Object type,
                         @Bind("this") Node inliningTarget,
                         @Cached DescriptorCheckNode descriptorCheckNode,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/TupleGetterBuiltins.java

@@ -68,8 +68,10 @@
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.HostCompilerDirectives.InliningCutoff;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -119,10 +121,11 @@ static Object getNone(@SuppressWarnings("unused") VirtualFrame frame, PTupleGett
             return self;
         }
 
-        @Specialization(guards = {"!isPTuple(instance)", "!isNone(instance)"})
-        static Object getOthers(@SuppressWarnings("unused") VirtualFrame frame, PTupleGetter self, Object instance, @SuppressWarnings("unused") Object owner,
+        @Fallback
+        @InliningCutoff
+        static Object getOthers(@SuppressWarnings("unused") VirtualFrame frame, Object self, Object instance, @SuppressWarnings("unused") Object owner,
                         @Cached PRaiseNode raiseNode) {
-            final int index = self.getIndex();
+            final int index = ((PTupleGetter) self).getIndex();
             throw raiseNode.raise(PythonBuiltinClassType.TypeError, DESC_FOR_INDEX_S_FOR_S_DOESNT_APPLY_TO_P,
                             index, "tuple subclasses", instance);
         }

scripts/slot_fuzzer.py

@@ -120,11 +120,12 @@ def del_descr(self): del self.descr
 # language=Python
 EXT_COMPILER = '''
 import sys
-from distutils.core import setup, Extension
 from pathlib import Path
 import warnings
 DIR = Path(__file__).parent.absolute()
 
+with warnings.catch_warnings(action="ignore"):
+    from distutils.core import setup, Extension
 
 def compile_ext(name):
     source_file = name + '.c'
@@ -304,7 +305,7 @@ def native_static_type_impl(name, mod_name, slots):
             if (PyType_Ready(&CustomType_{name}) < 0)
                 return NULL;
             Py_INCREF(&CustomType_{name});
-            return &CustomType_{name};
+            return (PyObject*) &CustomType_{name};
         }}
     ''')