* 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, 3 insertions, 10 deletions

diff --git a/vm.c b/vm.c
index 8cb97eead0..c87017814d 100644
--- a/vm.c
+++ b/vm.c
@@ -606,8 +606,8 @@ vm_yield(rb_thread_t *th, int argc, VALUE *argv)
 }
 
 VALUE
-vm_invoke_proc_core(rb_thread_t *th, rb_proc_t *proc,
-		    VALUE self, int argc, VALUE *argv, int restore_safe)
+vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc,
+	       VALUE self, int argc, VALUE *argv)
 {
     VALUE val = Qundef;
     int state;
@@ -623,7 +623,7 @@ vm_invoke_proc_core(rb_thread_t *th, rb_proc_t *proc,
     }
     TH_POP_TAG();
 
-    if (restore_safe) {
+    if (!proc->is_from_method) {
 	th->safe_level = stored_safe;
     }
 
@@ -650,13 +650,6 @@ vm_invoke_proc_core(rb_thread_t *th, rb_proc_t *proc,
     return val;
 }
 
-VALUE
-vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc,
-	       VALUE self, int argc, VALUE *argv)
-{
-    return vm_invoke_proc_core(th, proc, self, argc, argv, 1);
-}
-
 /* special variable */
 
 VALUE