kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 49390: [Backport #10775]

Browse source 
* vm_insnhelper.c (vm_throw_start): search the target to break
	  from a block with nested rescue, from the nested blocks.
	  [ruby-core:67765] [Bug #10775] [Fix GH-820]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-05-20 16:21:30 +00:00
parent 3e199f4c2b
commit 0c0be80f5e
4 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu May 21 01:07:41 2015 Misumi Rize <r@ayase-e.li>
* vm_insnhelper.c (vm_throw_start): search the target to break
from a block with nested rescue, from the nested blocks.
[ruby-core:67765] [Bug #10775] [Fix GH-820]
Thu May 21 00:55:45 2015 Koichi Sasada <ko1@atdot.net> Thu May 21 00:55:45 2015 Koichi Sasada <ko1@atdot.net>
* vm_args.c: protect value stack from calling other methods * vm_args.c: protect value stack from calling other methods

14
bootstraptest/test_block.rb
View file

@ -597,3 +597,17 @@ assert_equal 'true', %q{
C1.new.foo{} C1.new.foo{}
} }
assert_equal 'ok', %q{
1.times do
begin
raise
rescue
begin
raise
rescue
break
end
end
end
'ok'
}

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.3" #define RUBY_VERSION "2.2.3"
#define RUBY_RELEASE_DATE "2015-05-21" #define RUBY_RELEASE_DATE "2015-05-21"
#define RUBY_PATCHLEVEL 112 #define RUBY_PATCHLEVEL 113
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5

4
vm_insnhelper.c
View file

@ -630,13 +630,11 @@ vm_throw_start(rb_thread_t * const th, rb_control_frame_t * const reg_cfp, int s
rb_iseq_t *base_iseq = GET_ISEQ(); rb_iseq_t *base_iseq = GET_ISEQ();
escape_cfp = reg_cfp; escape_cfp = reg_cfp;
search_parent: while (base_iseq->type != ISEQ_TYPE_BLOCK) {
if (base_iseq->type != ISEQ_TYPE_BLOCK) {
if (escape_cfp->iseq->type == ISEQ_TYPE_CLASS) { if (escape_cfp->iseq->type == ISEQ_TYPE_CLASS) {
escape_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(escape_cfp); escape_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(escape_cfp);
ep = escape_cfp->ep; ep = escape_cfp->ep;
base_iseq = escape_cfp->iseq; base_iseq = escape_cfp->iseq;
goto search_parent;
} }
else { else {
ep = VM_EP_PREV_EP(ep); ep = VM_EP_PREV_EP(ep);