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) 59202: [Backport #13690]

Browse source 
compile.c: disallow next in once

	* compile.c (iseq_compile_each0): turned dregx context in "once"
	  into "guarded" type from "block" type, to disallow `next`,
	  `break`, `redo` as well as outside "once".
	  [ruby-core:81805] [Bug #13690]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-08-09 13:29:42 +00:00
parent 12474f0347
commit e55b415c2f
5 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
Wed Aug 9 22:27:23 2017 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_syntax.rb (test_invalid_{break,next}): use
assert_in_out_err instead of assert_syntax_error because on ruby_2_3
assert_syntax_error uses eval.
Wed Aug 9 22:27:23 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (iseq_compile_each0): turned dregx context in "once"
into "guarded" type from "block" type, to disallow `next`,
`break`, `redo` as well as outside "once".
[Bug #13690]
Wed Aug 9 21:28:34 2017 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_process.rb (test_rlimit_{name,value}): test in UTF-8

5
compile.c
View file

@ -28,6 +28,8 @@
#undef RUBY_UNTYPED_DATA_WARNING
#define RUBY_UNTYPED_DATA_WARNING 0
#define ISEQ_TYPE_ONCE_GUARD ISEQ_TYPE_DEFINED_GUARD
#define FIXNUM_INC(n, i) ((n)+(INT2FIX(i)&~FIXNUM_FLAG))
#define FIXNUM_OR(n, i) ((n)|INT2FIX(i))
@ -5489,7 +5491,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
int ic_index = iseq->body->is_size++;
NODE *dregx_node = NEW_NODE(NODE_DREGX, node->u1.value, node->u2.value, node->u3.value);
NODE *block_node = NEW_NODE(NODE_SCOPE, 0, dregx_node, 0);
const rb_iseq_t * block_iseq = NEW_CHILD_ISEQ(block_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
const rb_iseq_t *block_iseq = NEW_CHILD_ISEQ(block_node, make_name_for_block(iseq),
ISEQ_TYPE_ONCE_GUARD, line);
ADD_INSN2(ret, line, once, block_iseq, INT2FIX(ic_index));

11
test/ruby/test_exception.rb
View file

@ -905,15 +905,4 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status|
}
end;
end
def test_break_in_once
assert_separately([], "#{<<-"begin;"}\n#{<<~'end;'}")
begin;
obj = Object.new
def obj.try
/#{break}/o
end
assert_raise(LocalJumpError, /proc-closure/) {obj.try}
end;
end
end

8
test/ruby/test_syntax.rb
View file

@ -453,8 +453,16 @@ WARN
}
end
def test_invalid_break
assert_syntax_error("def m; break; end", /Invalid break/)
assert_in_out_err([], '/#{break}/', [], /Invalid break \(SyntaxError\)$/)
assert_in_out_err([], '/#{break}/o', [], /Invalid break \(SyntaxError\)$/)
end
def test_invalid_next
assert_syntax_error("def m; next; end", /Invalid next/)
assert_in_out_err([], '/#{next}/', [], /Invalid next \(SyntaxError\)$/)
assert_in_out_err([], '/#{next}/o', [], /Invalid next \(SyntaxError\)$/)
end
def test_lambda_with_space

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.5"
#define RUBY_RELEASE_DATE "2017-08-09"
#define RUBY_PATCHLEVEL 362
#define RUBY_PATCHLEVEL 363
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 8