jruby · Dec 2, 2014 · Dec 2, 2014
diff --git a/core/src/main/java/org/jruby/RubyBasicObject.java b/core/src/main/java/org/jruby/RubyBasicObject.java
@@ -1597,11 +1597,7 @@ protected IRubyObject yieldUnder(final ThreadContext context, RubyModule under,
 
     private Block setupBlock(Block block) {
         // FIXME: This is an ugly hack to resolve JRUBY-1381; I'm not proud of it
-        block = block.cloneBlock();
-        block.getBinding().setSelf(this);
-        block.getBinding().getFrame().setSelf(this);
-
-        return block;
+        return block.cloneBlockForEval(this);
     }
 
     /**

diff --git a/core/src/main/java/org/jruby/RubySymbol.java b/core/src/main/java/org/jruby/RubySymbol.java
@@ -488,11 +488,6 @@ public IRubyObject yieldSpecific(ThreadContext context, IRubyObject arg0, IRubyO
                 return site.call(context, arg0, arg0, arg1, arg2);
             }
 
-            @Override
-            public Block cloneBlock(Binding binding) {
-                return new Block(this, binding);
-            }
-
             public String getFile() {
                 return symbol;
             }

diff --git a/core/src/main/java/org/jruby/runtime/Block.java b/core/src/main/java/org/jruby/runtime/Block.java
@@ -190,6 +190,20 @@ public Block cloneBlockAndFrame() {
         return newBlock;
     }
 
+    public Block cloneBlockForEval(IRubyObject self) {
+        Binding newBinding = new Binding(self, binding.getFrame().duplicate(), binding.getVisibility(), binding.getKlass(), binding.getDynamicScope(), binding.getBacktrace());
+
+        Block block = new Block(body, newBinding);
+
+        block.type = type;
+        block.escapeBlock = this;
+
+        block.getBinding().setSelf(self);
+        block.getBinding().getFrame().setSelf(self);
+
+        return block;
+    }
+
     /**
      * What is the arity of this block?
      * 

diff --git a/core/src/main/java/org/jruby/runtime/BlockBody.java b/core/src/main/java/org/jruby/runtime/BlockBody.java
@@ -157,8 +157,6 @@ public IRubyObject yieldSpecific(ThreadContext context, IRubyObject arg0, IRubyO
     public abstract StaticScope getStaticScope();
     public abstract void setStaticScope(StaticScope newScope);
 
-    public abstract Block cloneBlock(Binding binding);
-
     /**
      * What is the arity of this block?
      *
@@ -284,4 +282,4 @@ public IRubyObject newArgsArrayFromArgsWithoutUnbox(IRubyObject[] args, ThreadCo
         }
         return value;
     }
-}
+}
diff --git a/core/src/main/java/org/jruby/runtime/CallBlock.java b/core/src/main/java/org/jruby/runtime/CallBlock.java
@@ -119,10 +119,6 @@ public void setStaticScope(StaticScope newScope) {
         // ignore
     }
 
-    public Block cloneBlock(Binding binding) {
-        return new Block(this, binding.clone());
-    }
-
     public Arity arity() {
         return arity;
     }

diff --git a/core/src/main/java/org/jruby/runtime/CallBlock19.java b/core/src/main/java/org/jruby/runtime/CallBlock19.java
@@ -118,10 +118,6 @@ public void setStaticScope(StaticScope newScope) {
         // ignore
     }
 
-    public Block cloneBlock(Binding binding) {
-        return new Block(this, binding.clone());
-    }
-
     public Arity arity() {
         return arity;
     }

diff --git a/core/src/main/java/org/jruby/runtime/CompiledSharedScopeBlock.java b/core/src/main/java/org/jruby/runtime/CompiledSharedScopeBlock.java
@@ -52,9 +52,4 @@ private CompiledSharedScopeBlock(Arity arity, DynamicScope containingScope, Comp
     protected Frame pre(ThreadContext context, RubyModule klass, Binding binding) {
         return context.preForBlock(binding, klass);
     }
-
-    @Override
-    public Block cloneBlock(Binding binding) {
-        return new Block(this, binding);
-    }
 }
diff --git a/core/src/main/java/org/jruby/runtime/ContextAwareBlockBody.java b/core/src/main/java/org/jruby/runtime/ContextAwareBlockBody.java
@@ -40,12 +40,4 @@ public void setStaticScope(StaticScope newScope) {
     public Arity arity() {
         return arity;
     }
-
-    public Block cloneBlock(Binding binding) {
-        // We clone dynamic scope because this will be a new instance of a block.  Any previously
-        // captured instances of this block may still be around and we do not want to start
-        // overwriting those values when we create a new one.
-        // ENEBO: Once we make self, lastClass, and lastMethod immutable we can remove duplicate
-        return new Block(this, binding.clone());
-    }
 }
diff --git a/core/src/main/java/org/jruby/runtime/JavaInternalBlockBody.java b/core/src/main/java/org/jruby/runtime/JavaInternalBlockBody.java
@@ -97,11 +97,6 @@ public StaticScope getStaticScope() {
     public void setStaticScope(StaticScope newScope) {
     }
 
-    @Override
-    public Block cloneBlock(Binding binding) {
-        return new Block(this, binding);
-    }
-
     @Override
     public Arity arity() {
         return arity;

diff --git a/core/src/main/java/org/jruby/runtime/NullBlockBody.java b/core/src/main/java/org/jruby/runtime/NullBlockBody.java
@@ -67,11 +67,6 @@ public StaticScope getStaticScope() {
     public void setStaticScope(StaticScope newScope) {
     }
 
-    @Override
-    public Block cloneBlock(Binding binding) {
-        return null;
-    }
-
     @Override
     public Arity arity() {
         return null;

diff --git a/core/src/main/java/org/jruby/runtime/SharedScopeBlock.java b/core/src/main/java/org/jruby/runtime/SharedScopeBlock.java
@@ -58,9 +58,4 @@ protected Frame pre(ThreadContext context, RubyModule klass, Binding binding) {
     public IRubyObject call(ThreadContext context, IRubyObject[] args, IRubyObject replacementSelf, Binding binding, Block.Type type) {
         return yield(context, newArgsArrayFromArgsWithoutUnbox(args, context), null, null, true, binding, type);
     }
-
-    @Override
-    public Block cloneBlock(Binding binding) {
-        return new Block(this, binding);
-    }
 }