diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-02 11:08:44 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-02 11:08:44 +0000 |
| commit | 319088e9c7ae9836efd242592ea80c9794a45002 (patch) | |
| tree | 4af392612508133a1f7aa015c9781aac88479982 /vm_insnhelper.h | |
| parent | 14bf66f25210248334f4730784ad00c18b7d651e (diff) | |
* class.c, insns.def, method.h, proc.c, vm.c, vm_core.h, vm_eval.c,
vm_insnhelper.c, vm_insnhelper.h, vm_method.c: add klass to
rb_control_frame_t to implement super correctly.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.h')
| -rw-r--r-- | vm_insnhelper.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vm_insnhelper.h b/vm_insnhelper.h index ffabbda23d..fdaa818e6c 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -170,8 +170,8 @@ enum vm_regan_acttype { } \ } while (0) -#define CALL_METHOD(num, blockptr, flag, id, me, recv) do { \ - VALUE v = vm_call_method(th, GET_CFP(), (num), (blockptr), (flag), (id), (me), (recv)); \ +#define CALL_METHOD(num, blockptr, flag, id, me, recv, defined_class) do { \ + VALUE v = vm_call_method(th, GET_CFP(), (num), (blockptr), (flag), (id), (me), (recv), (defined_class)); \ if (v == Qundef) { \ RESTORE_REGS(); \ NEXT_INSN(); \ @@ -213,8 +213,9 @@ enum vm_regan_acttype { #if USE_IC_FOR_SPECIALIZED_METHOD #define CALL_SIMPLE_METHOD(num, id, recv) do { \ - VALUE klass = CLASS_OF(recv); \ - CALL_METHOD((num), 0, 0, (id), vm_method_search((id), klass, ic), (recv)); \ + VALUE klass = CLASS_OF(recv), defined_class; \ + const rb_method_entry_t *me = vm_method_search((id), klass, ic, &defined_class); \ + CALL_METHOD((num), 0, 0, (id), me, (recv), defined_class); \ } while (0) #else |