summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-30 16:37:33 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-30 16:37:33 +0000
commite0c00fccc47fbf473768cc84d808c2de06b1e69f (patch)
treedf1428e37687b4dd318aa252d8495708bdd30764 /ChangeLog
parentd22cfb2fdb900cdbc732a3667b5706130905a21c (diff)
merge revision(s) r46464: [Backport #9959]
* vm.c (invoke_block_from_c): move call/return event timing for bmethod. It can invoke inconsistent call event if this call raises argument error. [Bug #9959] * vm_insnhelper.c (vm_call_bmethod_body): ditto. * test/ruby/test_settracefunc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3782c3f714..e97de41aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Jul 31 01:22:43 2014 Koichi Sasada <ko1@atdot.net>
+
+ * vm.c (invoke_block_from_c): move call/return event timing for
+ bmethod. It can invoke inconsistent call event if this call raises
+ argument error.
+ [Bug #9959]
+
+ * vm_insnhelper.c (vm_call_bmethod_body): ditto.
+
+ * test/ruby/test_settracefunc.rb: add a test.
+
Thu Jul 31 01:12:55 2014 Koichi Sasada <ko1@atdot.net>
* vm_core.h: add VM_FRAME_MAGIC_RESCUE to recognize normal block or