diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:55:35 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:55:35 +0000 |
| commit | 74bbac68df669e77f1ccc5780bb1e9fc3df13d03 (patch) | |
| tree | c6a53be3d40349ce0d34f680dfa941d9eebe0380 /vm_insnhelper.h | |
| parent | 987bb11dc7ade805fcce0a54d78c0839e7a50e2b (diff) | |
merges r20967 from trunk into ruby_1_9_1.
* vm_insnhelper.c (vm_call_method): use class of method defined
instead of receiver's class on bmethod. fixes [ruby-core:20786]
* bootstraptest/test_method.rb: add a test for above.
* vm_insnhelper.c (vm_setup_method): remove unused parameter klass.
* vm_insnhelper.h (CALL_METHOD): ditto.
* insns.def, vm_eval.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.h')
| -rw-r--r-- | vm_insnhelper.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vm_insnhelper.h b/vm_insnhelper.h index 613d997a4c..6000f9478c 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -158,8 +158,8 @@ extern VALUE ruby_vm_global_state_version; c1->nd_next = __tmp_c2->nd_next; \ } while (0) -#define CALL_METHOD(num, blockptr, flag, id, mn, recv, klass) do { \ - VALUE v = vm_call_method(th, GET_CFP(), num, blockptr, flag, id, mn, recv, klass); \ +#define CALL_METHOD(num, blockptr, flag, id, mn, recv) do { \ + VALUE v = vm_call_method(th, GET_CFP(), num, blockptr, flag, id, mn, recv); \ if (v == Qundef) { \ RESTORE_REGS(); \ NEXT_INSN(); \ @@ -188,7 +188,7 @@ extern VALUE ruby_vm_global_state_version; #define CALL_SIMPLE_METHOD(num, id, recv) do { \ VALUE klass = CLASS_OF(recv); \ - CALL_METHOD(num, 0, 0, id, rb_method_node(klass, id), recv, CLASS_OF(recv)); \ + CALL_METHOD(num, 0, 0, id, rb_method_node(klass, id), recv); \ } while (0) #endif /* RUBY_INSNHELPER_H */ |