summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-30 15:34:56 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-30 15:34:56 +0000
commit447df19520513eb5bdac973bcfc94ddc26580d17 (patch)
treec80c1080f0831676aeb6d41177e311830768a980
parentb5b8e5e0f4e2d220073d69032c9b2b8a8289d49f (diff)
* vm_insnhelper.c (vm_call_cfunc): let set_trace_func use called_id
instead of original_id. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_insnhelper.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 736b5a9f3fd..ac064c6b2d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 31 00:30:54 2009 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm_insnhelper.c (vm_call_cfunc): let set_trace_func use called_id
+ instead of original_id.
+
Thu Jul 30 23:04:32 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* gem_prelude.rb (Gem.path): uses Gem.default_path as a default value
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index b1d36fb2348..c8c9452040b 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -362,7 +362,7 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
VALUE val = 0;
int state = 0;
VALUE klass = me->klass;
- ID id = me->original_id;
+ ID id = me->called_id;
EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass);