Correctly differentiate custom locals in frame materialization

Author: msimacek

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

@@ -344,6 +344,7 @@ static void doLocalsStorageUncachedAST(PFrame pyFrame, Frame frameToSync, @Suppr
         @Specialization(guards = { //
                         "!isBytecodeFrame(frameToSync)",
                         "isDictWithCustomStorage(pyFrame)",
+                        "!hasCustomLocals(frameToSync, pyFrame)",
                         "frameToSync.getFrameDescriptor() == cachedFd",
         }, //
                         limit = "1")
@@ -389,7 +390,7 @@ static void doGenericDictCachedAST(VirtualFrame frame, PFrame pyFrame, Frame fra
             }
         }
 
-        @Specialization(guards = {"!isBytecodeFrame(frameToSync)", "isDictWithCustomStorage(pyFrame)"}, replaces = "doGenericDictCachedAST")
+        @Specialization(guards = {"!isBytecodeFrame(frameToSync)", "isDictWithCustomStorage(pyFrame)", "!hasCustomLocals(frameToSync, pyFrame)"}, replaces = "doGenericDictCachedAST")
         static void doGenericDictAST(VirtualFrame frame, PFrame pyFrame, Frame frameToSync, @SuppressWarnings("unused") Node location,
                         @Cached HashingCollectionNodes.SetItemNode setItemNode,
                         @Cached BranchProfile updatedStorage,
@@ -474,6 +475,7 @@ static void doLocalsStorageUncached(PFrame pyFrame, Frame frameToSync, @Suppress
         @Specialization(guards = { //
                         "isBytecodeFrame(frameToSync)",
                         "isDictWithCustomStorage(pyFrame)",
+                        "!hasCustomLocals(frameToSync, pyFrame)",
                         "frameToSync.getFrameDescriptor() == cachedFd",
                         "variableSlotCount(cachedFd) < 32"
         }, limit = "1")
@@ -501,6 +503,7 @@ static void doGenericDictCachedExploded(VirtualFrame frame, PFrame pyFrame, Fram
         @Specialization(guards = { //
                         "isBytecodeFrame(frameToSync)",
                         "isDictWithCustomStorage(pyFrame)",
+                        "!hasCustomLocals(frameToSync, pyFrame)",
                         "frameToSync.getFrameDescriptor() == cachedFd",
         }, limit = "1", replaces = "doGenericDictCachedExploded")
         static void doGenericDictCachedLoop(VirtualFrame frame, PFrame pyFrame, Frame frameToSync, @SuppressWarnings("unused") Node location,
@@ -523,7 +526,8 @@ static void doGenericDictCachedLoop(VirtualFrame frame, PFrame pyFrame, Frame fr
             }
         }
 
-        @Specialization(guards = {"isBytecodeFrame(frameToSync)", "isDictWithCustomStorage(pyFrame)"}, replaces = {"doGenericDictCachedExploded", "doGenericDictCachedLoop"})
+        @Specialization(guards = {"isBytecodeFrame(frameToSync)", "isDictWithCustomStorage(pyFrame)", "!hasCustomLocals(frameToSync, pyFrame)"}, replaces = {"doGenericDictCachedExploded",
+                        "doGenericDictCachedLoop"})
         static void doGenericDict(VirtualFrame frame, PFrame pyFrame, Frame frameToSync, @SuppressWarnings("unused") Node location,
                         @Cached BranchProfile updatedStorage,
                         @Cached ConditionProfile hasFrame,
@@ -542,7 +546,7 @@ static void doGenericDict(VirtualFrame frame, PFrame pyFrame, Frame frameToSync,
             }
         }
 
-        @Specialization(guards = "!isDictWithCustomStorage(pyFrame)")
+        @Specialization(guards = "hasCustomLocals(frameToSync, pyFrame)")
         @SuppressWarnings("unused")
         static void doCustomLocalsObject(PFrame pyFrame, Frame frameToSync, Node location) {
             // nothing to do; we already worked on the custom object
@@ -611,6 +615,10 @@ protected static boolean isDictWithCustomStorage(PFrame pyFrame) {
             return localsObject instanceof PDict && PGuards.isBuiltinDict((PDict) localsObject);
         }
 
+        protected static boolean hasCustomLocals(Frame frameToSync, PFrame pyFrame) {
+            return PArguments.getSpecialArgument(frameToSync) == pyFrame.getLocalsDict();
+        }
+
         protected static LocalsStorage getLocalsStorage(PFrame pyFrame) {
             return (LocalsStorage) ((PDict) pyFrame.getLocalsDict()).getDictStorage();
         }