* insnhelper.ci (vm_call_bmethod): fix to propagate information

  that this proc is "from Method".  [ruby-dev:31490]
* proc.c (method_proc, rb_mod_define_method): ditto.
* vm.c (vm_invoke_proc_core): removed.
* vm_core.h: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 3 deletions

diff --git a/proc.c b/proc.c
index 507f1a8bda..d1e4436bdb 100644
--- a/proc.c
+++ b/proc.c
@@ -957,6 +957,7 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
 	    proc->block.iseq->defined_method_id = id;
 	    proc->block.iseq->klass = mod;
 	    proc->is_lambda = Qtrue;
+	    proc->is_from_method = Qtrue;
 	}
 	node = NEW_BMETHOD(body);
     }
@@ -1351,7 +1352,8 @@ rb_proc_new(
 static VALUE
 method_proc(VALUE method)
 {
-    VALUE proc;
+    VALUE procval;
+    rb_proc_t *proc;
     /*
      * class Method
      *   def to_proc
@@ -1361,8 +1363,10 @@ method_proc(VALUE method)
      *   end
      * end
      */
-    proc = rb_iterate((VALUE (*)(VALUE))mlambda, 0, bmcall, method);
-    return proc;
+    procval = rb_iterate((VALUE (*)(VALUE))mlambda, 0, bmcall, method);
+    GetProcPtr(procval, proc);
+    proc->is_from_method = 1;
+    return procval;
 }
 
 static VALUE