fix two invalid identity profiles in multi-context mode

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -2104,28 +2104,39 @@ public TriState isIdenticalOrUndefined(Object other,
      * {@code tp_iter} for every user class.
      */
     @ExportMessage
-    public Object getIteratorWithState(ThreadState state,
-                    @Cached("createIdentityProfile()") ValueProfile iterMethodProfile,
-                    @CachedLibrary("this") PythonObjectLibrary plib,
-                    @CachedLibrary(limit = "2") PythonObjectLibrary methodLib,
-                    @Cached IteratorNodes.IsIteratorObjectNode isIteratorObjectNode,
-                    @Cached PythonObjectFactory factory,
-                    @Shared("raise") @Cached PRaiseNode raise) {
-        Object v = plib.getDelegatedValue(this);
-        Object iterMethod = iterMethodProfile.profile(plib.lookupAttributeOnType(this, __ITER__));
-        if (iterMethod != PNone.NONE) {
-            if (iterMethod != PNone.NO_VALUE) {
-                Object iterObj = methodLib.callUnboundMethodIgnoreGetExceptionWithState(iterMethod, state, v);
-                if (iterObj != PNone.NO_VALUE && isIteratorObjectNode.execute(iterObj)) {
-                    return iterObj;
-                }
+    public static class GetIteratorWithState {
+        public static final ValueProfile createIterMethodProfile() {
+            if (singleContextAssumption().isValid()) {
+                return ValueProfile.createIdentityProfile();
             } else {
-                Object getItemAttrObj = plib.lookupAttributeOnType(this, __GETITEM__);
-                if (getItemAttrObj != PNone.NO_VALUE) {
-                    return factory.createSequenceIterator(v);
+                return ValueProfile.createClassProfile();
+            }
+        }
+
+        @Specialization
+        public static Object getIteratorWithState(PythonAbstractObject self, ThreadState state,
+                        @Cached("createIterMethodProfile()") ValueProfile iterMethodProfile,
+                        @CachedLibrary("self") PythonObjectLibrary plib,
+                        @CachedLibrary(limit = "2") PythonObjectLibrary methodLib,
+                        @Cached IteratorNodes.IsIteratorObjectNode isIteratorObjectNode,
+                        @Cached PythonObjectFactory factory,
+                        @Shared("raise") @Cached PRaiseNode raise) {
+            Object v = plib.getDelegatedValue(self);
+            Object iterMethod = iterMethodProfile.profile(plib.lookupAttributeOnType(self, __ITER__));
+            if (iterMethod != PNone.NONE) {
+                if (iterMethod != PNone.NO_VALUE) {
+                    Object iterObj = methodLib.callUnboundMethodIgnoreGetExceptionWithState(iterMethod, state, v);
+                    if (iterObj != PNone.NO_VALUE && isIteratorObjectNode.execute(iterObj)) {
+                        return iterObj;
+                    }
+                } else {
+                    Object getItemAttrObj = plib.lookupAttributeOnType(self, __GETITEM__);
+                    if (getItemAttrObj != PNone.NO_VALUE) {
+                        return factory.createSequenceIterator(v);
+                    }
                 }
             }
+            throw raise.raise(PythonErrorType.TypeError, ErrorMessages.OBJ_NOT_ITERABLE, self);
         }
-        throw raise.raise(PythonErrorType.TypeError, ErrorMessages.OBJ_NOT_ITERABLE, this);
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/WrapTpNew.java

@@ -40,6 +40,7 @@
  */
 package com.oracle.graal.python.nodes.function.builtins;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
@@ -130,7 +131,11 @@ public Object execute(VirtualFrame frame) {
             if (newMethod instanceof PBuiltinFunction) {
                 if (builtinProfile == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    builtinProfile = ValueProfile.createIdentityProfile();
+                    if (lookupLanguageReference(PythonLanguage.class).get().singleContextAssumption.isValid()) {
+                        builtinProfile = ValueProfile.createIdentityProfile();
+                    } else {
+                        builtinProfile = ValueProfile.getUncached();
+                    }
                 }
                 NodeFactory<? extends PythonBuiltinBaseNode> factory = ((PBuiltinFunction) builtinProfile.profile(newMethod)).getBuiltinNodeFactory();
                 if (factory != null) {