only exact dicts as locals can use the fast path

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_builtin.txt

@@ -15,6 +15,7 @@
 *graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_exec_redirected
 *graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_filter
 *graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_filter_pickle
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_general_eval
 *graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_hex
 *graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_id
 *graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_isinstance

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/AccessNameNode.java

@@ -40,8 +40,10 @@
  */
 package com.oracle.graal.python.nodes.frame;
 
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 public interface AccessNameNode {
@@ -51,8 +53,9 @@ default boolean hasLocals(VirtualFrame frame) {
         return PArguments.getSpecialArgument(frame) != null;
     }
 
-    default boolean hasLocalsDict(VirtualFrame frame) {
-        return PArguments.getSpecialArgument(frame) instanceof PDict;
+    default boolean hasLocalsDict(VirtualFrame frame, IsBuiltinClassProfile isBuiltin) {
+        Object specialArgument = PArguments.getSpecialArgument(frame);
+        return specialArgument instanceof PDict && isBuiltin.profileObject(specialArgument, PythonBuiltinClassType.PDict);
     }
 
     public abstract String getAttributeId();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/DeleteNameNode.java

@@ -83,9 +83,10 @@ private void deleteGlobalIfKeyError(VirtualFrame frame, PException e) {
         getDeleteGlobalNode().executeVoid(frame);
     }
 
-    @Specialization(guards = "hasLocalsDict(frame)")
+    @Specialization(guards = "hasLocalsDict(frame, isBuiltin)")
     protected void readFromLocalsDict(VirtualFrame frame,
                     @Cached BranchProfile updatedStorage,
+                    @SuppressWarnings("unused") @Cached IsBuiltinClassProfile isBuiltin,
                     @Cached("createBinaryProfile()") ConditionProfile hasFrame,
                     @CachedLibrary(limit = "3") HashingStorageLibrary lib) {
         PDict frameLocals = (PDict) PArguments.getSpecialArgument(frame);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadNameNode.java

@@ -89,8 +89,9 @@ protected static HashingStorage getStorage(VirtualFrame frame) {
         return ((PDict) PArguments.getSpecialArgument(frame)).getDictStorage();
     }
 
-    @Specialization(guards = "hasLocalsDict(frame)", limit = "1")
+    @Specialization(guards = "hasLocalsDict(frame, isBuiltin)", limit = "1")
     protected Object readFromLocalsDict(VirtualFrame frame,
+                    @SuppressWarnings("unused") @Cached IsBuiltinClassProfile isBuiltin,
                     @CachedLibrary(value = "getStorage(frame)") HashingStorageLibrary hlib) {
         Object result = hlib.getItem(getStorage(frame), attributeId);
         if (result == null) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/WriteNameNode.java

@@ -44,6 +44,7 @@
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.nodes.subscript.SetItemNode;
 import com.oracle.truffle.api.dsl.Cached;
@@ -63,8 +64,9 @@ public static WriteNameNode create(String attributeId, ExpressionNode rhs) {
         return WriteNameNodeGen.create(attributeId, rhs);
     }
 
-    @Specialization(guards = "hasLocalsDict(frame)")
+    @Specialization(guards = "hasLocalsDict(frame, isBuiltin)")
     protected void writeLocalsDict(VirtualFrame frame, Object value,
+                    @SuppressWarnings("unused") @Cached IsBuiltinClassProfile isBuiltin,
                     @Cached("create()") HashingCollectionNodes.SetItemNode setItem) {
         PDict frameLocals = (PDict) PArguments.getSpecialArgument(frame);
         setItem.execute(frame, frameLocals, attributeId, value);