summaryrefslogtreecommitdiffstats
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
commitc624b1326825b0f25dde0890831b8f76a44f1f86 (patch)
treec80c1080f0831676aeb6d41177e311830768a980
parent4211d8fe40a60745a1bd0fa2f18f496133a916ce (diff)
downloadruby-c624b1326825b0f25dde0890831b8f76a44f1f86.tar.gz
ruby-c624b1326825b0f25dde0890831b8f76a44f1f86.tar.xz
ruby-c624b1326825b0f25dde0890831b8f76a44f1f86.zip
* vm_insnhelper.c (vm_call_cfunc): let set_trace_func use called_id
instead of original_id. git-svn-id: http://svn.ruby-lang.org/repos/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 736b5a9f3..ac064c6b2 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 b1d36fb23..c8c945204 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);