summaryrefslogtreecommitdiff
path: root/vm_dump.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-15 14:59:41 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-15 14:59:41 +0000
commitc330876d7c5065f89234becc5125426d0d136bdc (patch)
treed7a65121d7250d0137a2c75d7b7d454737815e7d /vm_dump.c
parentd3cbda6e8dc5732f64b06cacb4c137f01ebe0461 (diff)
* method.h, vm_core.h: add rb_method_entry_t. Remove nodes around
method management. This change affect some VM control stack structure. * vm.c, vm_insnhelper.c, vm_method.c, vm_eval.c: ditto. and make some refactoring. * insns.def, class.c, eval.c, proc.c, vm_dump.c : ditto. * vm_core.h, compile.c (iseq_specialized_instruction): remove VM_CALL_SEND_BIT. use another optimization tech for Kernel#send. * node.h: remove unused node types. * ext/objspace/objspace.c (count_nodes): ditto. * gc.c: add mark/free functions for method entry. * include/ruby/intern.h: remove decl of rb_define_notimplement_method_id(). nobody can use it because noex is not opend. * iseq.c (iseq_mark): fix to check ic_method is available. * iseq.c (rb_iseq_disasm): fix to use rb_method_get_iseq(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_dump.c')
-rw-r--r--vm_dump.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/vm_dump.c b/vm_dump.c
index eb2a89f..d22c652 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -112,9 +112,9 @@ control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp)
}
}
}
- else if (cfp->method_id) {
- iseq_name = rb_id2name(cfp->method_id);
- snprintf(posbuf, MAX_POSBUF, ":%s", rb_id2name(cfp->method_id));
+ else if (cfp->me) {
+ iseq_name = rb_id2name(cfp->me->original_id);
+ snprintf(posbuf, MAX_POSBUF, ":%s", rb_id2name(cfp->me->original_id));
line = -1;
}
@@ -253,7 +253,7 @@ vm_stack_dump_each(rb_thread_t *th, rb_control_frame_t *cfp)
if (iseq == 0) {
if (RUBYVM_CFUNC_FRAME_P(cfp)) {
- name = rb_id2name(cfp->method_id);
+ name = rb_id2name(cfp->me->original_id);
}
else {
name = "?";