Fixing problem with removing slots in FrameDescriptor in ClassScope

ppisl · ppisl · commit 4ef6faf6f732 · 2019-09-04T10:46:47.000+02:00
Satisfying spotbugs
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/inline01.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/inline01.tast
@@ -1,7 +1,9 @@
 BinaryArithmeticExpression SourceSection: [0,5]`a + b`
   LookupAndCallBinaryNodeGen SourceSection: None
     Op: __add__
-  ReadNameNodeGen SourceSection: [0,1]`a`
-    Identifier: a
-  ReadNameNodeGen SourceSection: [4,5]`b`
-    Identifier: b
+  ReadLocalVariableNode SourceSection: [0,1]`a`
+    Frame: [0,a,Illegal]
+    ReadVariableFromFrameNodeGen SourceSection: None
+  ReadLocalVariableNode SourceSection: [4,5]`b`
+    Frame: [1,b,Illegal]
+    ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/classDef11.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/classDef11.tast
@@ -111,7 +111,7 @@ ModuleRootNode Name: <module 'classDef11'> SourceSection: [0,282]`def make_named
                                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                             ReadLocalCellNodeGen SourceSection: None
                                               ReadLocalVariableNode SourceSection: None
-                                                Frame: [8,name,Illegal]
+                                                Frame: [4,name,Illegal]
                                                 ReadVariableFromFrameNodeGen SourceSection: None
                                               ReadFromCellNodeGen SourceSection: None
                                         SetItemNodeGen SourceSection: [104,135]`n_sequence_fields = ...`
@@ -134,7 +134,7 @@ ModuleRootNode Name: <module 'classDef11'> SourceSection: [0,282]`def make_named
                                                 ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                               ReadLocalCellNodeGen SourceSection: None
                                                 ReadLocalVariableNode SourceSection: None
-                                                  Frame: [6,fields,Illegal]
+                                                  Frame: [2,fields,Illegal]
                                                   ReadVariableFromFrameNodeGen SourceSection: None
                                                 ReadFromCellNodeGen SourceSection: None
                                             ReadClassAttributeNodeGen SourceSection: None
@@ -162,7 +162,7 @@ ModuleRootNode Name: <module 'classDef11'> SourceSection: [0,282]`def make_named
                                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                             ReadLocalCellNodeGen SourceSection: None
                                               ReadLocalVariableNode SourceSection: None
-                                                Frame: [6,fields,Illegal]
+                                                Frame: [2,fields,Illegal]
                                                 ReadVariableFromFrameNodeGen SourceSection: None
                                               ReadFromCellNodeGen SourceSection: None
                                         SetItemNodeGen SourceSection: [168,264]`def __repr__(self):↵...`
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/localMember02.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/localMember02.tast
@@ -127,7 +127,7 @@ ModuleRootNode Name: <module 'localMember02'> SourceSection: [0,156]`def fn():
                                                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                                           ReadLocalCellNodeGen SourceSection: None
                                                             ReadLocalVariableNode SourceSection: None
-                                                              Frame: [2,a_local_var_out,Illegal]
+                                                              Frame: [1,a_local_var_out,Illegal]
                                                               ReadVariableFromFrameNodeGen SourceSection: None
                                                             ReadFromCellNodeGen SourceSection: None
                                                     Return Expresssion: ObjectLiteralNode SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/localMember03.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ClassDefTests/localMember03.tast
@@ -127,7 +127,7 @@ ModuleRootNode Name: <module 'localMember03'> SourceSection: [0,210]`def fn():
                                                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                                           ReadLocalCellNodeGen SourceSection: None
                                                             ReadLocalVariableNode SourceSection: None
-                                                              Frame: [2,a_local_var,Illegal]
+                                                              Frame: [0,a_local_var,Illegal]
                                                               ReadVariableFromFrameNodeGen SourceSection: None
                                                             ReadFromCellNodeGen SourceSection: None
                                                       SetItemNodeGen SourceSection: [131,190]`def method01():↵    ...`
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/_descriptor.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/_descriptor.tast
@@ -164,7 +164,7 @@ ModuleRootNode Name: <module '_descriptor'> SourceSection: [0,3601]`# Copyright
                                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                           ReadLocalCellNodeGen SourceSection: None
                                             ReadLocalVariableNode SourceSection: None
-                                              Frame: [10,name,Illegal]
+                                              Frame: [5,name,Illegal]
                                               ReadVariableFromFrameNodeGen SourceSection: None
                                             ReadFromCellNodeGen SourceSection: None
                                       SetItemNodeGen SourceSection: [2179,2210]`n_sequence_fields = ...`
@@ -187,7 +187,7 @@ ModuleRootNode Name: <module '_descriptor'> SourceSection: [0,3601]`# Copyright
                                               ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                             ReadLocalCellNodeGen SourceSection: None
                                               ReadLocalVariableNode SourceSection: None
-                                                Frame: [7,fields,Illegal]
+                                                Frame: [2,fields,Illegal]
                                                 ReadVariableFromFrameNodeGen SourceSection: None
                                               ReadFromCellNodeGen SourceSection: None
                                           ReadClassAttributeNodeGen SourceSection: None
@@ -215,7 +215,7 @@ ModuleRootNode Name: <module '_descriptor'> SourceSection: [0,3601]`# Copyright
                                             ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                           ReadLocalCellNodeGen SourceSection: None
                                             ReadLocalVariableNode SourceSection: None
-                                              Frame: [7,fields,Illegal]
+                                              Frame: [2,fields,Illegal]
                                               ReadVariableFromFrameNodeGen SourceSection: None
                                             ReadFromCellNodeGen SourceSection: None
                                       SetItemNodeGen SourceSection: [2244,2307]`def __str__(self):↵ ...`
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/collections__init__.scope b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/collections__init__.scope
@@ -800,7 +800,7 @@ Scope: []
             FreeVars: Empty
     Scope: OrderedDict
         Kind: Class
-        FrameDescriptor: [move_to_end, fromkeys, keys, setdefault, values, update, __delitem__, pop, __update, __marker, popitem, copy, __reduce__, <>temp47, __iter__, clear, __reversed__, __eq__, __class__, __setitem__, __sizeof__, __repr__, __doc__, __init__, items, __ne__]
+        FrameDescriptor: [move_to_end, fromkeys, keys, setdefault, values, update, __delitem__, pop, __update, __marker, popitem, copy, __reduce__, <>temp24, __iter__, clear, __reversed__, __eq__, __class__, __setitem__, __sizeof__, __repr__, __doc__, __init__, items, __ne__]
         CellVars: [__class__]
         FreeVars: Empty
         Scope: __eq__
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/collections__init__.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/collections__init__.tast
@@ -808,7 +808,7 @@ ModuleRootNode Name: <module 'collections__init__'> SourceSection: [0,47650]`'''
                   CelVars: __class__
                   FreeVars: None
                   NeedsCellFrame: False
-                  FrameDescriptor: 26 slots [__init__, __setitem__, __delitem__, __iter__, __reversed__, clear, popitem, move_to_end, __sizeof__, update, __update, keys, items, values, __ne__, __marker, pop, setdefault, __repr__, __reduce__, copy, fromkeys, __eq__, __class__, <>temp47, __doc__]
+                  FrameDescriptor: 26 slots [__init__, __setitem__, __delitem__, __iter__, __reversed__, clear, popitem, move_to_end, __sizeof__, update, __update, keys, items, values, __ne__, __marker, pop, setdefault, __repr__, __reduce__, copy, fromkeys, __eq__, __class__, <>temp24, __doc__]
                   ExecutionSlots:
                     FreeVarsSlots: None
                     CellVarsSlots: __class__, 
@@ -2447,9 +2447,9 @@ ModuleRootNode Name: <module 'collections__init__'> SourceSection: [0,47650]`'''
                               CalleeContext SourceSection: None
                         BlockNode SourceSection: [8311,8369]`update = __update = ...`
                           WriteLocalVariableNodeGen SourceSection: None
-                            Identifier: <>temp47
+                            Identifier: <>temp24
                             WriteLocalFrameSlotNodeGen SourceSection: None
-                              Frame: [47,<>temp47,Illegal]
+                              Frame: [24,<>temp24,Illegal]
                             GetAttributeNodeGen SourceSection: [8331,8369]`_collections_abc.Mut...`
                               GetFixedAttributeNodeGen SourceSection: None
                                 Key: update
@@ -2475,15 +2475,15 @@ ModuleRootNode Name: <module 'collections__init__'> SourceSection: [0,47650]`'''
                                 Index: 0
                             StringLiteralNode SourceSection: None
                             ReadLocalVariableNode SourceSection: None
-                              Frame: [47,<>temp47,Illegal]
+                              Frame: [24,<>temp24,Illegal]
                               ReadVariableFromFrameNodeGen SourceSection: None
                           SetItemNodeGen SourceSection: None
                             ArgumentExpressionNode SourceSection: None
                               ReadIndexedArgumentNodeGen SourceSection: None
                                 Index: 0
                             StringLiteralNode SourceSection: None
                             ReadLocalVariableNode SourceSection: None
-                              Frame: [47,<>temp47,Illegal]
+                              Frame: [24,<>temp24,Illegal]
                               ReadVariableFromFrameNodeGen SourceSection: None
                         SetItemNodeGen SourceSection: [8375,8507]`def keys(self):↵    ...`
                           ArgumentExpressionNode SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/initCollectionsPart1.scope b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/initCollectionsPart1.scope
@@ -165,7 +165,7 @@ Scope: []
             FreeVars: Empty
     Scope: OrderedDict
         Kind: Class
-        FrameDescriptor: [move_to_end, fromkeys, keys, setdefault, values, update, __delitem__, pop, __update, __marker, popitem, copy, __reduce__, <>temp47, __iter__, clear, __reversed__, __eq__, __class__, __setitem__, __sizeof__, __repr__, __doc__, __init__, items, __ne__]
+        FrameDescriptor: [move_to_end, fromkeys, keys, setdefault, values, update, __delitem__, pop, __update, __marker, popitem, copy, __reduce__, <>temp24, __iter__, clear, __reversed__, __eq__, __class__, __setitem__, __sizeof__, __repr__, __doc__, __init__, items, __ne__]
         CellVars: [__class__]
         FreeVars: Empty
         Scope: __eq__
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/initCollectionsPart1.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/initCollectionsPart1.tast
@@ -808,7 +808,7 @@ ModuleRootNode Name: <module 'initCollectionsPart1'> SourceSection: [0,32029]`''
                   CelVars: __class__
                   FreeVars: None
                   NeedsCellFrame: False
-                  FrameDescriptor: 26 slots [__init__, __setitem__, __delitem__, __iter__, __reversed__, clear, popitem, move_to_end, __sizeof__, update, __update, keys, items, values, __ne__, __marker, pop, setdefault, __repr__, __reduce__, copy, fromkeys, __eq__, __class__, <>temp47, __doc__]
+                  FrameDescriptor: 26 slots [__init__, __setitem__, __delitem__, __iter__, __reversed__, clear, popitem, move_to_end, __sizeof__, update, __update, keys, items, values, __ne__, __marker, pop, setdefault, __repr__, __reduce__, copy, fromkeys, __eq__, __class__, <>temp24, __doc__]
                   ExecutionSlots:
                     FreeVarsSlots: None
                     CellVarsSlots: __class__, 
@@ -2447,9 +2447,9 @@ ModuleRootNode Name: <module 'initCollectionsPart1'> SourceSection: [0,32029]`''
                               CalleeContext SourceSection: None
                         BlockNode SourceSection: [8311,8369]`update = __update = ...`
                           WriteLocalVariableNodeGen SourceSection: None
-                            Identifier: <>temp47
+                            Identifier: <>temp24
                             WriteLocalFrameSlotNodeGen SourceSection: None
-                              Frame: [47,<>temp47,Illegal]
+                              Frame: [24,<>temp24,Illegal]
                             GetAttributeNodeGen SourceSection: [8331,8369]`_collections_abc.Mut...`
                               GetFixedAttributeNodeGen SourceSection: None
                                 Key: update
@@ -2475,15 +2475,15 @@ ModuleRootNode Name: <module 'initCollectionsPart1'> SourceSection: [0,32029]`''
                                 Index: 0
                             StringLiteralNode SourceSection: None
                             ReadLocalVariableNode SourceSection: None
-                              Frame: [47,<>temp47,Illegal]
+                              Frame: [24,<>temp24,Illegal]
                               ReadVariableFromFrameNodeGen SourceSection: None
                           SetItemNodeGen SourceSection: None
                             ArgumentExpressionNode SourceSection: None
                               ReadIndexedArgumentNodeGen SourceSection: None
                                 Index: 0
                             StringLiteralNode SourceSection: None
                             ReadLocalVariableNode SourceSection: None
-                              Frame: [47,<>temp47,Illegal]
+                              Frame: [24,<>temp24,Illegal]
                               ReadVariableFromFrameNodeGen SourceSection: None
                         SetItemNodeGen SourceSection: [8375,8507]`def keys(self):↵    ...`
                           ArgumentExpressionNode SourceSection: None
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java
@@ -53,7 +53,7 @@ public final class PythonParserImpl implements PythonParser {
     private final int timeStatistics;
     private long timeInParser = 0;
     private long numberOfFiles = 0;
-
+    
     public PythonParserImpl(Env env) {
         this.useExperimentalParser = env.getOptions().get(PythonOptions.UseExperimentalParser);
         this.logFiles = env.getOptions().get(PythonOptions.ParserLogFiles);
@@ -77,13 +77,7 @@ private static Python3NewParser getPython3NewParser(Source source, ParserErrorCa
         parser.setErrorHandler(new PythonErrorStrategy());
         return parser;
     }
-
-    private ParserRuleContext lastTree;
-
-    public ParserRuleContext getLastAntlrTree() {
-        return lastTree;
-    }
-
+    
     private ScopeInfo lastGlobalScope;
 
     public ScopeInfo getLastGlobaScope() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/ScopeEnvironment.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/ScopeEnvironment.java
@@ -179,14 +179,20 @@ public ScopeInfo popScope() {
             localySeenVars.clear();
         }
         if (definingScopeKind == ScopeInfo.ScopeKind.Class) {
+            boolean copy = false;
             for (Object identifier : identifiers) {
                 String name = (String) identifier;
                 if (name.startsWith("<>class")) {
                     definingScope.getFrameDescriptor().removeFrameSlot(identifier);
                     name = name.substring(7);
                     definingScope.createSlotIfNotPresent(name);
+                    copy = true;
                 }
             }
+            if (copy) {
+                // we copy it because the idexes are now wrong due the issue GR-17984
+                definingScope.setFrameDescriptor(definingScope.getFrameDescriptor().copy());
+            }
         }
         currentScope = currentScope.getParent();
         return definingScope;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/ScopeInfo.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/ScopeInfo.java
@@ -54,7 +54,7 @@ public enum ScopeKind {
     }
 
     private final String scopeId;
-    private final FrameDescriptor frameDescriptor;
+    private FrameDescriptor frameDescriptor;
     private final ArrayList<String> identifierToIndex;
     private ScopeKind scopeKind;
     private final ScopeInfo parent;
@@ -131,6 +131,10 @@ public FrameDescriptor getFrameDescriptor() {
         return frameDescriptor;
     }
 
+    public void setFrameDescriptor(FrameDescriptor frameDescriptor) {
+        this.frameDescriptor = frameDescriptor;
+    }
+    
     public ScopeInfo getParent() {
         return parent;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/DescriptiveBailErrorListener.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/DescriptiveBailErrorListener.java
@@ -76,7 +76,7 @@ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
                 throw handleRecognitionException;
             }
         } else if (recognizer instanceof Python3NewParser) {
-            PIncompleteSourceException handleRecognitionException = handleRecognitionException(((Python3Parser) recognizer).getExpectedTokens(), entireMessage, null, line);
+            PIncompleteSourceException handleRecognitionException = handleRecognitionException(((Python3NewParser) recognizer).getExpectedTokens(), entireMessage, null, line);
             if (handleRecognitionException != null) {
                 throw handleRecognitionException;
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3New.g4 b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3New.g4
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/ArgDefListBuilder.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/ArgDefListBuilder.java
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
