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) 53658: [Backport #12018]

Browse source 
* compile.c (iseq_peephole_optimize): don't apply tailcall
	  optimization to send/invokesuper instructions with blockiseq.
	  This is a follow-up to the changes in r51903; blockiseq is now
	  the third operand of send/invokesuper instructions.
	  [ruby-core:73413] [Bug #12018]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-03-29 13:25:02 +00:00
parent a61019eee3
commit 6af6154b41
4 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Tue Mar 29 22:08:36 2016 Kazuki Yamaguchi <k@rhe.jp>
* compile.c (iseq_peephole_optimize): don't apply tailcall
optimization to send/invokesuper instructions with blockiseq.
This is a follow-up to the changes in r51903; blockiseq is now
the third operand of send/invokesuper instructions.
[ruby-core:73413] [Bug #12018]
Tue Mar 29 21:22:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (xstring): reset heredoc indent after dedenting,

8
compile.c
View file

@ -2228,8 +2228,12 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
if (piobj) {
struct rb_call_info *ci = (struct rb_call_info *)piobj->operands[0];
rb_iseq_t *blockiseq = (rb_iseq_t *)piobj->operands[1];
if (blockiseq == 0) {
if (piobj->insn_id == BIN(send) || piobj->insn_id == BIN(invokesuper)) {
if (piobj->operands[2] == 0) { /* no blockiseq */
ci->flag |= VM_CALL_TAILCALL;
}
}
else {
ci->flag |= VM_CALL_TAILCALL;
}
}

16
test/ruby/test_optimization.rb
View file

@ -275,6 +275,22 @@ class TestRubyOptimization < Test::Unit::TestCase
assert_equal(123, delay { 123 }.call, bug6901)
end
def just_yield
yield
end
def test_tailcall_inhibited_by_block
assert_separately([], <<~'end;')
def just_yield
yield
end
iseq = RubyVM::InstructionSequence
result = iseq.compile("just_yield {:ok}", __FILE__, __FILE__, __LINE__,
tailcall_optimization: true).eval
assert_equal(:ok, result)
end;
end
class Bug10557
def [](_)
block_given?

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2016-03-29"
#define RUBY_PATCHLEVEL 49
#define RUBY_PATCHLEVEL 50
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3