[Truffle] Fix Method#to_proc rather than adding a condition in instan…

…ce_exec.
jruby · Mar 18, 2015 · af8184e · af8184e
1 parent 83f583d
commit af8184e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
@@ -225,8 +225,6 @@ public Object instanceEval(VirtualFrame frame, Object receiver, UndefinedPlaceho
     @CoreMethod(names = "instance_exec", needsBlock = true, argumentsAsArray = true)
     public abstract static class InstanceExecNode extends YieldingCoreMethodNode {
 
-        private final ConditionProfile rubyMethodProfile = ConditionProfile.createBinaryProfile();
-
         public InstanceExecNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
@@ -239,10 +237,6 @@ public InstanceExecNode(InstanceExecNode prev) {
         public Object instanceExec(VirtualFrame frame, Object receiver, Object[] arguments, RubyProc block) {
             notDesignedForCompilation();
 
-            if (rubyMethodProfile.profile(block.getSelfCapturedInScope() instanceof RubyMethod)) {
-                return yield(frame, block, arguments);
-            }
-
             return yieldWithModifiedSelf(frame, block, receiver, arguments);
         }
 

diff --git a/truffle/src/main/ruby/core/shims.rb b/truffle/src/main/ruby/core/shims.rb
@@ -145,8 +145,9 @@ def _offset_to_milliseconds
 class Method
 
   def to_proc
+    meth = self
     proc { |*args|
-      self.call(*args)
+      meth.call(*args)
     }
   end