1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile.c: wrong optimization

Browse Source 
* compile.c (compile_branch_condition): expression which has side
  effects should not be eliminated.
  [ruby-core:80740] [Bug #13444]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-04-18 13:14:06 +00:00
parent d939fdc119
commit 5cc56f0d9b
2 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compile.c
View File

@ -2249,7 +2249,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
OPERAND_AT(pobj, 0) == Qfalse :
FALSE);
}
else if (IS_INSN_ID(pobj, putstring)) {
else if (IS_INSN_ID(pobj, putstring) || IS_INSN_ID(pobj, duparray)) {
cond = IS_INSN_ID(iobj, branchif);
}
else if (IS_INSN_ID(pobj, putnil)) {
@ -2907,18 +2907,8 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *cond,
case NODE_LIT: /* NODE_LIT is always true */
case NODE_TRUE:
case NODE_STR:
case NODE_DSTR:
case NODE_XSTR:
case NODE_DXSTR:
case NODE_DREGX:
case NODE_DREGX_ONCE:
case NODE_DSYM:
case NODE_ARRAY:
case NODE_ZARRAY:
case NODE_HASH:
case NODE_LAMBDA:
case NODE_DEFN:
case NODE_DEFS:
/* printf("useless condition eliminate (%s)\n", ruby_node_name(nd_type(cond))); */
ADD_INSNL(ret, nd_line(cond), jump, then_label);
break;

43
test/ruby/test_optimization.rb
View File

@ -524,4 +524,47 @@ class TestRubyOptimization < Test::Unit::TestCase
assert_no_match(/putstring/, insn)
assert_no_match(/newrange/, insn)
end
def test_branch_condition_backquote
bug = '[ruby-core:80740] [Bug #13444] redefined backquote should be called'
class << self
def `(s)
@q = s
@r
end
end
@q = nil
@r = nil
assert_equal("bar", ("bar" unless `foo`), bug)
assert_equal("foo", @q, bug)
@q = nil
@r = true
assert_equal("bar", ("bar" if `foo`), bug)
assert_equal("foo", @q, bug)
@q = nil
@r = "z"
assert_equal("bar", ("bar" if `foo#{@r}`))
assert_equal("fooz", @q, bug)
end
def test_branch_condition_def
bug = '[ruby-core:80740] [Bug #13444] method should be defined'
c = Class.new do
raise "bug" unless def t;:ok;end
end
assert_nothing_raised(NoMethodError, bug) do
assert_equal(:ok, c.new.t)
end
end
def test_branch_condition_defs
bug = '[ruby-core:80740] [Bug #13444] singleton method should be defined'
raise "bug" unless def self.t;:ok;end
assert_nothing_raised(NameError, bug) do
assert_equal(:ok, t)
end
end
end