Need to distinguish between vars and locals specifically

Only locals are relevant for splitting decisions, access to arguments is always safe. Signed-off-by: Stefan Marr <git@stefan-marr.de>
smarr · Jul 27, 2017 · 918c3b2 · 918c3b2
1 parent 298e619
commit 918c3b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/som/compiler/MethodBuilder.java b/src/som/compiler/MethodBuilder.java
@@ -76,6 +76,7 @@ public final class MethodBuilder {
   private boolean throwsNonLocalReturn;       // does directly or indirectly a non-local return
 
   private boolean accessesVariablesOfOuterScope;
+  private boolean accessesLocalOfOuterScope;
 
   private final LinkedHashMap<String, Argument> arguments = new LinkedHashMap<>();
   private final LinkedHashMap<String, Local>    locals    = new LinkedHashMap<>();
@@ -215,8 +216,8 @@ public void makeCatchNonLocalReturn() {
     ctx.needsToCatchNonLocalReturn = true;
   }
 
-  public boolean accessesVariablesOfOuterScope() {
-    return accessesVariablesOfOuterScope;
+  public boolean accessesLocalOfOuterScope() {
+    return accessesLocalOfOuterScope;
   }
 
   public boolean requiresContext() {
@@ -421,6 +422,9 @@ protected Variable getVariable(final String varName) {
       Variable outerVar = outerBuilder.getVariable(varName);
       if (outerVar != null) {
         accessesVariablesOfOuterScope = true;
+        if (outerVar instanceof Local) {
+          accessesLocalOfOuterScope = true;
+        }
       }
       return outerVar;
     }
@@ -530,6 +534,7 @@ protected Local getLocal(final String varName) {
       Local outerLocal = outerBuilder.getLocal(varName);
       if (outerLocal != null) {
         accessesVariablesOfOuterScope = true;
+        accessesLocalOfOuterScope = true;
       }
       return outerLocal;
     }

diff --git a/src/som/compiler/Parser.java b/src/som/compiler/Parser.java
@@ -1148,10 +1148,10 @@ private ExpressionNode primary(final MethodBuilder builder) throws ProgramDefini
 
         if (bgenc.requiresContext() || VmSettings.TRUFFLE_DEBUGGER_ENABLED) {
           return new BlockNodeWithContext(blockMethod,
-              bgenc.accessesVariablesOfOuterScope(), lastMethodsSourceSection);
+              bgenc.accessesLocalOfOuterScope(), lastMethodsSourceSection);
         } else {
           return new BlockNode(blockMethod,
-              bgenc.accessesVariablesOfOuterScope(), lastMethodsSourceSection);
+              bgenc.accessesLocalOfOuterScope(), lastMethodsSourceSection);
         }
       }
       case LCurly: {

diff --git a/src/som/interpreter/nodes/literals/BlockNode.java b/src/som/interpreter/nodes/literals/BlockNode.java
@@ -104,10 +104,6 @@ public BlockNodeWithContext(final SInvokable blockMethod,
       super(blockMethod, needsAdjustmentOnScopeChange, source);
     }
 
-    public BlockNodeWithContext(final BlockNodeWithContext node) {
-      this(node.blockMethod, node.needsAdjustmentOnScopeChange, node.sourceSection);
-    }
-
     @Override
     public SBlock executeSBlock(final VirtualFrame frame) {
       return new SBlock(blockMethod, frame.materialize(), blockClass);