From 51fee9065c9a5b5914ca0bc87e532a7c58b201fa Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 28 Dec 2008 09:39:43 +0000 Subject: merges r21084 from trunk into ruby_1_9_1. * vm_insnhelper.c (vm_call_method, vm_call_cfunc): use original id instead of calling id when NODE_CFUNC or NODE_BMETHOD. fixes Bug #632 [ruby-core:19282]. * vm_eval.c (vm_call0, vm_call_super): ditto. * vm_method.c (rb_add_method, rb_alias): store original id in nd_file field of NODE_METHOD. * test/stringio/test_stringio.rb: add a test. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_eval.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index aea00e2f5..851eaaf9f 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -64,7 +64,7 @@ vm_call0(rb_thread_t * th, VALUE klass, VALUE recv, VALUE id, ID oid, vm_push_frame(th, 0, VM_FRAME_MAGIC_CFUNC, recv, (VALUE)blockptr, 0, reg_cfp->sp, 0, 1); - cfp->method_id = id; + cfp->method_id = oid; cfp->method_class = klass; val = call_cfunc(body->nd_cfnc, recv, body->nd_argc, argc, argv); @@ -96,7 +96,7 @@ vm_call0(rb_thread_t * th, VALUE klass, VALUE recv, VALUE id, ID oid, break; } case NODE_BMETHOD:{ - val = vm_call_bmethod(th, id, body->nd_cval, + val = vm_call_bmethod(th, oid, body->nd_cval, recv, klass, argc, (VALUE *)argv, blockptr); break; } @@ -152,8 +152,8 @@ vm_call_super(rb_thread_t * const th, const int argc, const VALUE * const argv) return method_missing(recv, id, argc, argv, 0); } - body = body->nd_body; - return vm_call0(th, klass, recv, id, id, argc, argv, body, CALL_SUPER); + return vm_call0(th, klass, recv, id, (ID)body->nd_file, + argc, argv, body->nd_body, CALL_SUPER); } VALUE -- cgit