diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 11:17:54 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 11:17:54 +0000 |
| commit | bc090868b8e480ac4d179bc6b7d2ba65d4f82aef (patch) | |
| tree | b1b18236a6438dadae5681413b8dddef419da13f /ChangeLog | |
| parent | 69e671aa966f7d9ef67513141f593e61be58e2d3 (diff) | |
merge revision(s) 51713: [Backport #11492] [Backport #11646]
* vm.c (hook_before_rewind): prevent kicking :return event while
finishing vm_exec func because invoke_block_from_c() kick a :return
event for bmethods.
[Bug #11492]
* test/ruby/test_settracefunc.rb: add a test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,12 @@ +Wed Nov 18 20:14:38 2015 Koichi Sasada <ko1@atdot.net> + + * vm.c (hook_before_rewind): prevent kicking :return event while + finishing vm_exec func because invoke_block_from_c() kick a :return + event for bmethods. + [Bug #11492] + + * test/ruby/test_settracefunc.rb: add a test. + Wed Nov 18 20:10:31 2015 Aaron Patterson <tenderlove@ruby-lang.org> * test/openssl/test_ssl_session.rb: Fix tests so that they take in to |