Add Specialization to ContainsKeyNode and deleted profiling with base classes method

Author: Franziska Geiger

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java

@@ -85,6 +85,7 @@
 import com.oracle.graal.python.nodes.PNodeWithGlobalState.DefaultContextManager;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
+import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
 import com.oracle.graal.python.nodes.builtins.ListNodes.FastConstructListNode;
@@ -266,7 +267,7 @@ protected boolean wrappedString(PString s) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 isBuiltinClassProfile = IsBuiltinClassProfile.create();
             }
-            return isBuiltinClassProfile.profileClassWithBaseClasses(getClass(s), PythonBuiltinClassType.PString);
+            return isBuiltinClassProfile.profileClass(getClass(s), PythonBuiltinClassType.PString);
         }
 
         protected EconomicMapStorage switchToEconomicMap(HashingStorage storage) {
@@ -589,6 +590,19 @@ protected boolean readUncached(VirtualFrame frame, PythonObjectHybridDictStorage
         }
 
         @Specialization(guards = "!isJavaString(name)")
+        protected boolean readUncached(VirtualFrame frame, DynamicObjectStorage storage, PString name,
+                        @Cached LookupInheritedAttributeNode.Dynamic lookupHash,
+                        @Cached LookupAttributeInMRONode.Dynamic lookupStringHash,
+                        @Cached ContainsKeyNode recursiveNode) {
+            if (lookupHash.execute(name, __HASH__) == lookupStringHash.execute(PythonBuiltinClassType.PString, __HASH__)) {
+                return recursiveNode.execute(frame, storage, name.getValue());
+            }
+            CompilerDirectives.transferToInterpreter();
+            // see GR-17389
+            throw new RuntimeException("String subclasses with custom hash in dict not implemented.");
+        }
+
+        @Specialization(guards = {"!isJavaString(name)", "!isPString(name)"})
         @SuppressWarnings("unused")
         protected boolean readUncached(DynamicObjectStorage storage, Object name) {
             return false;

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

@@ -45,7 +45,6 @@
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
-import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -206,20 +205,6 @@ public boolean profileClass(LazyPythonClass clazz, PythonBuiltinClassType type)
         }
     }
 
-    public boolean profileClassWithBaseClasses(LazyPythonClass clazz, PythonBuiltinClassType type) {
-        if (!profileClass(clazz, type)) {
-            PythonAbstractClass[] baseClasses = ((PythonClass) clazz).getBaseClasses();
-            for (PythonAbstractClass baseClazz : baseClasses) {
-                if (profileClass(baseClazz, type)) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            return true;
-        }
-    }
-
     public boolean profileClass(PythonAbstractClass clazz, PythonBuiltinClassType type) {
         if (clazz instanceof PythonBuiltinClass) {
             if (!isBuiltinClass) {