fix guard on setting and getting __dict__ for exact builtin objects - but allow setting and getting the dict for extensions of builtins

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java

@@ -479,10 +479,16 @@ protected PNone doIt(Object object, Object key,
     @Builtin(name = __DICT__, minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, isGetter = true, isSetter = true)
     @GenerateNodeFactory
     static abstract class DictNode extends PythonBinaryBuiltinNode {
-        private final IsBuiltinClassProfile isBuiltinClassProfile = IsBuiltinClassProfile.create();
+        private final IsBuiltinClassProfile exactObjInstanceProfile = IsBuiltinClassProfile.create();
+        private final IsBuiltinClassProfile exactBuiltinInstanceProfile = IsBuiltinClassProfile.create();
 
         protected boolean isExactObjectInstance(PythonObject self) {
-            return isBuiltinClassProfile.profileObject(self, PythonBuiltinClassType.PythonObject);
+            return exactObjInstanceProfile.profileObject(self, PythonBuiltinClassType.PythonObject);
+        }
+
+        protected boolean isBuiltinObjectExact(PythonObject self) {
+            // any builtin class except Modules
+            return exactBuiltinInstanceProfile.profileIsOtherBuiltinObject(self, PythonBuiltinClassType.PythonModule);
         }
 
         @SuppressWarnings("unused")
@@ -492,7 +498,7 @@ Object dict(PythonClass self, PNone none) {
             throw new AssertionError();
         }
 
-        @Specialization(guards = {"!isBuiltinObject(self)", "!isClass(self)", "!isExactObjectInstance(self)", "isNoValue(none)"})
+        @Specialization(guards = {"!isBuiltinObjectExact(self)", "!isClass(self)", "!isExactObjectInstance(self)", "isNoValue(none)"})
         Object dict(PythonObject self, @SuppressWarnings("unused") PNone none) {
             PHashingCollection dict = self.getDict();
             if (dict == null) {
@@ -502,7 +508,7 @@ Object dict(PythonObject self, @SuppressWarnings("unused") PNone none) {
             return dict;
         }
 
-        @Specialization(guards = {"!isBuiltinObject(self)", "!isClass(self)", "!isExactObjectInstance(self)"})
+        @Specialization(guards = {"!isBuiltinObjectExact(self)", "!isClass(self)", "!isExactObjectInstance(self)"})
         Object dict(PythonObject self, PDict dict) {
             self.getDictStableAssumption().invalidate();
             self.setDict(dict);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/IsBuiltinClassProfile.java

@@ -65,6 +65,18 @@ public static IsBuiltinClassProfile create() {
         return new IsBuiltinClassProfile();
     }
 
+    public boolean profileIsAnyBuiltinException(PException object) {
+        return profileIsAnyBuiltinClass(object.getExceptionObject().getLazyPythonClass());
+    }
+
+    public boolean profileIsAnyBuiltinObject(PythonObject object) {
+        return profileIsAnyBuiltinClass(object.getLazyPythonClass());
+    }
+
+    public boolean profileIsOtherBuiltinObject(PythonObject object, PythonBuiltinClassType type) {
+        return profileIsOtherBuiltinClass(object.getLazyPythonClass(), type);
+    }
+
     public boolean profileException(PException object, PythonBuiltinClassType type) {
         return profileClass(object.getExceptionObject().getLazyPythonClass(), type);
     }
@@ -74,6 +86,76 @@ public boolean profileObject(PythonObject object, PythonBuiltinClassType type) {
 
     }
 
+    public boolean profileIsAnyBuiltinClass(LazyPythonClass clazz) {
+        if (clazz instanceof PythonBuiltinClassType) {
+            if (!isBuiltinType) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                isBuiltinType = true;
+            }
+            return true;
+        } else {
+            if (clazz instanceof PythonBuiltinClass) {
+                if (!isBuiltinClass) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    isBuiltinClass = true;
+                }
+                return true;
+            }
+            if (!isOtherClass) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                isOtherClass = true;
+            }
+            return false;
+        }
+    }
+
+    public boolean profileIsOtherBuiltinClass(LazyPythonClass clazz, PythonBuiltinClassType type) {
+        if (clazz instanceof PythonBuiltinClassType) {
+            if (!isBuiltinType) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                isBuiltinType = true;
+            }
+            if (clazz == type) {
+                if (!match) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    match = true;
+                }
+                return false;
+            } else {
+                if (!noMatch) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    noMatch = true;
+                }
+                return true;
+            }
+        } else {
+            if (clazz instanceof PythonBuiltinClass) {
+                if (!isBuiltinClass) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    isBuiltinClass = true;
+                }
+                if (((PythonBuiltinClass) clazz).getType() == type) {
+                    if (!match) {
+                        CompilerDirectives.transferToInterpreterAndInvalidate();
+                        match = true;
+                    }
+                    return false;
+                } else {
+                    if (!noMatch) {
+                        CompilerDirectives.transferToInterpreterAndInvalidate();
+                        noMatch = true;
+                    }
+                    return true;
+                }
+            }
+            if (!isOtherClass) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                isOtherClass = true;
+            }
+            return false;
+        }
+    }
+
     public boolean profileClass(LazyPythonClass clazz, PythonBuiltinClassType type) {
         if (clazz instanceof PythonBuiltinClassType) {
             if (!isBuiltinType) {