Treat thread polls as variable visibility barriers.

Fixes last remaining failure with test:mri:jit.
enebo · Mar 11, 2015 · 09c29b8 · 09c29b8
1 parent 440c956
commit 09c29b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -69,7 +69,6 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: PHASE='-Prake -Dtask=spec:profiler'
-    - env: PHASE='-Prake -Dtask=test:mri:jit'
 
 branches:
   only:

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,9 +198,11 @@ public void addLoads(Map<Operand, Operand> varRenameMap) {
                     }
                     it.previous();
                 }
-            } else if (scopeBindingHasEscaped && (i.getOperation() == Operation.PUT_GLOBAL_VAR)) {
-                // 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
+            } 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.
                 it.next();
                 for (LocalVariable v : reqdLoads) {
                     it.add(new LoadLocalVarInstr(scope, getLocalVarReplacement(v, scope, varRenameMap), v));

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,9 +260,11 @@ public boolean addStores(Map<Operand, Operand> varRenameMap, Set<LocalVariable>
                 dirtyVars.clear();
             }
 
-            if (scopeBindingHasEscaped && (i.getOperation() == Operation.PUT_GLOBAL_VAR)) {
-                // 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
+            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.
                 instrs.previous();
                 for (LocalVariable v : dirtyVars) {
                     addedStores = true;