Actually add this conditional correctly. See 09c29b8.

jruby · Mar 12, 2015 · 2d63a39 · 2d63a39
1 parent 20be989
commit 2d63a39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/ir/dataflow/analyses/LoadLocalVarPlacementNode.java b/core/src/main/java/org/jruby/ir/dataflow/analyses/LoadLocalVarPlacementNode.java
@@ -198,8 +198,10 @@ public void addLoads(Map<Operand, Operand> varRenameMap) {
                     }
                     it.previous();
                 }
-            } else if (scopeBindingHasEscaped && (i.getOperation() == Operation.PUT_GLOBAL_VAR
-                    || i.getOperation() == Operation.THREAD_POLL)) {
+            } else if (
+                    (scopeBindingHasEscaped && i.getOperation() == Operation.PUT_GLOBAL_VAR)
+                    || i.getOperation() == Operation.THREAD_POLL
+                    ) {
                 // 1. Global-var tracing can execute closures set up in previous trace-var calls
                 // in which case we would have the 'scopeBindingHasEscaped' flag set to true.
                 // 2. Threads can update bindings, so we treat thread poll boundaries the same way.

diff --git a/core/src/main/java/org/jruby/ir/dataflow/analyses/StoreLocalVarPlacementNode.java b/core/src/main/java/org/jruby/ir/dataflow/analyses/StoreLocalVarPlacementNode.java
@@ -260,8 +260,10 @@ public boolean addStores(Map<Operand, Operand> varRenameMap, Set<LocalVariable>
                 dirtyVars.clear();
             }
 
-            if (scopeBindingHasEscaped && (i.getOperation() == Operation.PUT_GLOBAL_VAR
-                    || i.getOperation() == Operation.THREAD_POLL)) {
+            if (
+                    (scopeBindingHasEscaped && i.getOperation() == Operation.PUT_GLOBAL_VAR)
+                    || i.getOperation() == Operation.THREAD_POLL
+                    ) {
                 // 1. Global-var tracing can execute closures set up in previous trace-var calls
                 // in which case we would have the 'scopeBindingHasEscaped' flag set to true.
                 // 2. Threads can update bindings, so we treat thread poll boundaries the same way.