Inlining clones can call this method. Make sure they do not pick up e…

…nsureClone state.
jruby · Oct 15, 2014 · 8952362 · 8952362
1 parent 79a8dba
commit 8952362
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ir/transformations/inlining/CloneInfo.java b/core/src/main/java/org/jruby/ir/transformations/inlining/CloneInfo.java
@@ -24,7 +24,9 @@ protected CloneInfo(IRScope scope) {
     }
 
     public SimpleCloneInfo cloneForCloningClosure(IRClosure clonedClosure) {
-        SimpleCloneInfo clone = new SimpleCloneInfo(clonedClosure, true);
+        // If cloning for ensure block cloning we want to propagate that to child closure clones
+        boolean ensureClone = this instanceof SimpleCloneInfo && ((SimpleCloneInfo) this).isEnsureBlockCloneMode();
+        SimpleCloneInfo clone = new SimpleCloneInfo(clonedClosure, ensureClone);
 
         for (Variable v: variableRenameMap.keySet()) {
             clone.variableRenameMap.put(v, variableRenameMap.get(v));