Distinguish between normal clone & ensure-block clone for closures.

* It is useful to distinguish between different copies of cloned closures in cloned ensure blocks, especialy if the name and closure-id are used to index into maps.
jruby · Oct 10, 2014 · 1a27cb4 · 1a27cb4
1 parent 7381eb9
commit 1a27cb4
Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ir/IRClosure.java b/core/src/main/java/org/jruby/ir/IRClosure.java
@@ -304,7 +304,7 @@ public IRClosure cloneForInlining(CloneInfo ii) {
         IRClosure clonedClosure;
         IRScope lexicalParent = ii.getScope();
 
-        if (ii instanceof SimpleCloneInfo) {
+        if (ii instanceof SimpleCloneInfo && !((SimpleCloneInfo)ii).isEnsureBlockCloneMode()) {
             clonedClosure = new IRClosure(this, lexicalParent, closureId, getName());
         } else {
             int id = lexicalParent.getNextClosureId();

diff --git a/core/src/main/java/org/jruby/ir/transformations/inlining/SimpleCloneInfo.java b/core/src/main/java/org/jruby/ir/transformations/inlining/SimpleCloneInfo.java
@@ -17,6 +17,10 @@ public SimpleCloneInfo(IRScope scope, boolean isEnsureBlock) {
         this.isEnsureBlock = isEnsureBlock;
     }
 
+    public boolean isEnsureBlockCloneMode() {
+        return this.isEnsureBlock;
+    }
+
     public Variable getRenamedVariable(Variable variable) {
         Variable renamed = super.getRenamedVariable(variable);
 
@@ -47,4 +51,4 @@ protected Variable getRenamedVariableSimple(Variable v) {
     public void renameLabel(Label l) {
         labelRenameMap.put(l, getScope().getNewLabel());
     }
-}
+}