[GR-11996] Remove FrameSlot#getIndex usage

PullRequest: graalpython/216

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -1809,7 +1809,7 @@ Object method(PythonClass cls, Object self, PFunction func) {
         }
 
         @Specialization(guards = "isPythonBuiltinClass(cls)")
-        Object method(@SuppressWarnings("unused") PythonClass cls, Object self, PBuiltinFunction func) {
+        Object builtinMethod(@SuppressWarnings("unused") PythonClass cls, Object self, PBuiltinFunction func) {
             return factory().createBuiltinMethod(self, func);
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/ScopeInfo.java

@@ -25,6 +25,7 @@
  */
 package com.oracle.graal.python.parser;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -51,6 +52,7 @@ public enum ScopeKind {
 
     private final String scopeId;
     private final FrameDescriptor frameDescriptor;
+    private final ArrayList<String> identifierToIndex;
     private ScopeKind scopeKind;
     private final ScopeInfo parent;
 
@@ -86,6 +88,7 @@ public ScopeInfo(String scopeId, ScopeKind kind, FrameDescriptor frameDescriptor
         this.scopeKind = kind;
         this.frameDescriptor = frameDescriptor == null ? new FrameDescriptor() : frameDescriptor;
         this.parent = parent;
+        this.identifierToIndex = new ArrayList<>();
         // register current scope as child to parent scope
         if (this.parent != null) {
             this.nextChildScope = this.parent.firstChildScope;
@@ -139,11 +142,14 @@ public FrameSlot findFrameSlot(String identifier) {
         return this.getFrameDescriptor().findFrameSlot(identifier);
     }
 
-    private void createSlotIfNotPresent(String identifier) {
+    FrameSlot createSlotIfNotPresent(String identifier) {
         assert identifier != null : "identifier is null!";
         FrameSlot frameSlot = this.getFrameDescriptor().findFrameSlot(identifier);
         if (frameSlot == null) {
-            this.getFrameDescriptor().addFrameSlot(identifier);
+            identifierToIndex.add(identifier);
+            return getFrameDescriptor().addFrameSlot(identifier);
+        } else {
+            return frameSlot;
         }
     }
 
@@ -267,4 +273,13 @@ public String toString() {
         CompilerAsserts.neverPartOfCompilation();
         return scopeKind.toString() + " " + scopeId;
     }
+
+    public Integer getVariableIndex(String name) {
+        for (int i = 0; i < identifierToIndex.size(); i++) {
+            if (identifierToIndex.get(i).equals(name)) {
+                return i;
+            }
+        }
+        throw new IllegalStateException("Cannot find argument for name " + name + " in scope " + getScopeId());
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/TranslationEnvironment.java

@@ -180,7 +180,7 @@ public void createLocal(String name) {
     }
 
     private FrameSlot createAndReturnLocal(String name) {
-        return currentScope.getFrameDescriptor().findOrAddFrameSlot(name);
+        return currentScope.createSlotIfNotPresent(name);
     }
 
     private boolean isCellInCurrentScope(String name) {
@@ -224,35 +224,33 @@ private StatementNode getWriteNode(String name, FrameSlot slot, ExpressionNode r
         return factory.createWriteLocal(right, slot);
     }
 
-    private StatementNode getWriteNode(String name, Function<FrameSlot, ReadArgumentNode> getReadNode) {
-        FrameSlot slot = currentScope.findFrameSlot(name);
-        ExpressionNode right = getReadNode.apply(slot).asExpression();
-
-        return getWriteNode(name, slot, right);
+    private StatementNode getWriteNode(String name, Function<Integer, ReadArgumentNode> getReadNode) {
+        ExpressionNode right = getReadNode.apply(currentScope.getVariableIndex(name)).asExpression();
+        return getWriteNode(name, currentScope.findFrameSlot(name), right);
     }
 
     public StatementNode getWriteArgumentToLocal(String name) {
-        return getWriteNode(name, slot -> ReadIndexedArgumentNode.create(slot.getIndex()));
+        return getWriteNode(name, index -> ReadIndexedArgumentNode.create(index));
     }
 
     public StatementNode getWriteKeywordArgumentToLocal(String name, ReadDefaultArgumentNode readDefaultArgumentNode) {
-        return getWriteNode(name, slot -> ReadKeywordNode.create(name, slot.getIndex(), readDefaultArgumentNode));
+        return getWriteNode(name, index -> ReadKeywordNode.create(name, index, readDefaultArgumentNode));
     }
 
     public StatementNode getWriteRequiredKeywordArgumentToLocal(String name) {
-        return getWriteNode(name, slot -> ReadKeywordNode.create(name));
+        return getWriteNode(name, index -> ReadKeywordNode.create(name));
     }
 
     public StatementNode getWriteRequiredKeywordArgumentToLocal(String name, ReadDefaultArgumentNode readDefaultArgumentNode) {
-        return getWriteNode(name, slot -> ReadKeywordNode.create(name, readDefaultArgumentNode));
+        return getWriteNode(name, index -> ReadKeywordNode.create(name, readDefaultArgumentNode));
     }
 
     public StatementNode getWriteVarArgsToLocal(String name) {
-        return getWriteNode(name, slot -> ReadVarArgsNode.create(slot.getIndex()));
+        return getWriteNode(name, index -> ReadVarArgsNode.create(index));
     }
 
     public StatementNode getWriteKwArgsToLocal(String name, String[] names) {
-        return getWriteNode(name, slot -> ReadVarKeywordsNode.createForUserFunction(names));
+        return getWriteNode(name, index -> ReadVarKeywordsNode.createForUserFunction(names));
     }
 
     static ScopeInfo findVariableScope(ScopeInfo enclosingScope, String identifier) {
@@ -351,7 +349,7 @@ public static FrameSlot makeTempLocalVariable(FrameDescriptor frameDescriptor) {
 
     private void createGlobal(String name) {
         assert name != null : "name is null!";
-        globalScope.getFrameDescriptor().findOrAddFrameSlot(name);
+        globalScope.createSlotIfNotPresent(name);
     }
 
     public void addLocalGlobals(String name) {
@@ -401,7 +399,7 @@ protected ReadDefaultArgumentNode[] getDefaultArgumentReads() {
     }
 
     public FrameSlot getReturnSlot() {
-        return currentScope.getFrameDescriptor().findOrAddFrameSlot(RETURN_SLOT_ID);
+        return currentScope.createSlotIfNotPresent(RETURN_SLOT_ID);
     }
 
     private ScopeInfo findEnclosingClassScope() {