Review usages of IsForeignObjectNode and remove unnecessary ones

Author: eregon

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorNodes.java

@@ -79,9 +79,7 @@
 import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectProfile;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.GetClassNode.GetPythonObjectClassNode;
-import com.oracle.graal.python.nodes.object.IsForeignObjectNode;
 import com.oracle.graal.python.nodes.util.CastBuiltinStringToTruffleStringNode;
-import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
@@ -98,9 +96,6 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
-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.profiles.InlinedLoopConditionProfile;
@@ -172,8 +167,6 @@ static int length(@SuppressWarnings("unused") PNone iterable) {
         @Fallback
         @InliningCutoff
         static int length(VirtualFrame frame, Node inliningTarget, Object iterable,
-                        @Cached IsForeignObjectNode isForeignObjectNode,
-                        @Cached(inline = false) GetLengthForeign getLengthForeign,
                         @Cached GetClassNode getClassNode,
                         @Cached GetCachedTpSlotsNode getSlotsNode,
                         @Cached PyIndexCheckNode indexCheckNode,
@@ -185,12 +178,6 @@ static int length(VirtualFrame frame, Node inliningTarget, Object iterable,
                         @Cached InlinedConditionProfile hasLenProfile,
                         @Cached InlinedConditionProfile hasLengthHintProfile,
                         @Cached PRaiseNode.Lazy raiseNode) {
-            if (isForeignObjectNode.execute(inliningTarget, iterable)) {
-                int foreignLen = getLengthForeign.execute(iterable);
-                if (foreignLen != -1) {
-                    return foreignLen;
-                }
-            }
             Object clazz = getClassNode.execute(inliningTarget, iterable);
             TpSlots slots = getSlotsNode.execute(inliningTarget, clazz);
             if (hasLenProfile.profile(inliningTarget, slots.combined_sq_mp_length() != null)) {
@@ -229,35 +216,6 @@ static int length(VirtualFrame frame, Node inliningTarget, Object iterable,
         }
     }
 
-    /**
-     * Handles the special case of foreign Strings. If the input is not a string, returns -1.
-     */
-    @GenerateInline(false) // Intentionally lazy initialized
-    public abstract static class GetLengthForeign extends PNodeWithContext {
-        public abstract int execute(Object foreign);
-
-        @Specialization
-        static int doIt(Object foreign,
-                        @Bind("this") Node inliningTarget,
-                        @Cached InlinedConditionProfile isString,
-                        @CachedLibrary(limit = "3") InteropLibrary iLib,
-                        @Cached TruffleString.SwitchEncodingNode switchEncodingNode,
-                        @Cached TruffleString.CodePointLengthNode codePointLengthNode,
-                        @Cached GilNode gil) {
-            if (isString.profile(inliningTarget, iLib.isString(foreign))) {
-                gil.release(true);
-                try {
-                    return codePointLengthNode.execute(switchEncodingNode.execute(iLib.asTruffleString(foreign), TS_ENCODING), TS_ENCODING);
-                } catch (UnsupportedMessageException e) {
-                    throw CompilerDirectives.shouldNotReachHere();
-                } finally {
-                    gil.acquire();
-                }
-            }
-            return -1;
-        }
-    }
-
     @ImportStatic(PGuards.class)
     @GenerateInline
     @GenerateCached(false)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyMappingCheckNode.java

@@ -44,8 +44,6 @@
 import com.oracle.graal.python.builtins.objects.type.TpSlots.GetCachedTpSlotsNode;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.nodes.object.IsForeignObjectNode;
-import com.oracle.graal.python.nodes.util.LazyInteropLibrary;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateCached;
@@ -86,13 +84,8 @@ static boolean doSequence(@SuppressWarnings("unused") PSequence object) {
     @Specialization
     static boolean doGeneric(Node inliningTarget, Object object,
                     @Cached GetClassNode getClassNode,
-                    @Cached GetCachedTpSlotsNode getSlotsNode,
-                    @Cached IsForeignObjectNode isForeignObjectNode,
-                    @Cached LazyInteropLibrary lazyLib) {
+                    @Cached GetCachedTpSlotsNode getSlotsNode) {
         Object type = getClassNode.execute(inliningTarget, object);
-        if (isForeignObjectNode.execute(inliningTarget, object)) {
-            return lazyLib.get(inliningTarget).hasHashEntries(object);
-        }
         return getSlotsNode.execute(inliningTarget, type).mp_subscript() != null;
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyNumberCheckNode.java

@@ -45,8 +45,6 @@
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.attributes.LookupCallableSlotInMRONode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.nodes.object.IsForeignObjectNode;
-import com.oracle.graal.python.nodes.util.LazyInteropLibrary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateCached;
@@ -105,17 +103,12 @@ static boolean doNone(PNone object) {
 
     @Fallback
     static boolean doOthers(Node inliningTarget, Object object,
-                    @Cached IsForeignObjectNode isForeignObjectNode,
-                    @Cached LazyInteropLibrary interopLibrary,
                     @Cached GetClassNode getClassNode,
                     @Cached(parameters = "Index", inline = false) LookupCallableSlotInMRONode lookupIndex,
                     @Cached(parameters = "Float", inline = false) LookupCallableSlotInMRONode lookupFloat,
                     @Cached(parameters = "Int", inline = false) LookupCallableSlotInMRONode lookupInt,
                     @Cached PyComplexCheckNode checkComplex) {
         Object type = getClassNode.execute(inliningTarget, object);
-        if (isForeignObjectNode.execute(inliningTarget, object)) {
-            return interopLibrary.get(inliningTarget).isNumber(object);
-        }
         return lookupIndex.execute(type) != PNone.NO_VALUE || lookupInt.execute(type) != PNone.NO_VALUE || lookupFloat.execute(type) != PNone.NO_VALUE || checkComplex.execute(inliningTarget, object);
     }
 }