aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--compile.c10
-rw-r--r--test/ruby/test_optimization.rb5
3 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d163add93..003528fb51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 18 16:07:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * compile.c (iseq_peephole_optimize): should not replace the
+ current target INSN, not to follow the replaced dangling link in
+ the caller. [ruby-core:74993] [Bug #11816]
+
Mon Apr 18 12:56:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (flo_truncate): add an optional parameter, digits, as
diff --git a/compile.c b/compile.c
index 33cdea35f6..1304dfdaf4 100644
--- a/compile.c
+++ b/compile.c
@@ -852,6 +852,7 @@ INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
}
}
+#if 0
/*
* elemX, elem1, elemY => elemX, elem2, elemY
*/
@@ -867,6 +868,7 @@ REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
elem1->next->prev = elem2;
}
}
+#endif
static void
REMOVE_ELEM(LINK_ELEMENT *elem)
@@ -2056,15 +2058,13 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
* LABEL:
* leave
*/
- INSN *eiobj = new_insn_core(iseq, iobj->line_no, BIN(leave),
- diobj->operand_size, diobj->operands);
INSN *popiobj = new_insn_core(iseq, iobj->line_no,
BIN(pop), 0, 0);
/* replace */
unref_destination(iobj, 0);
- REPLACE_ELEM((LINK_ELEMENT *)iobj, (LINK_ELEMENT *)eiobj);
- INSERT_ELEM_NEXT((LINK_ELEMENT *)eiobj, (LINK_ELEMENT *)popiobj);
- iobj = eiobj;
+ iobj->insn_id = BIN(leave);
+ iobj->operand_size = 0;
+ INSERT_ELEM_NEXT(&iobj->link, &popiobj->link);
goto again;
}
/*
diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb
index c336930440..605e0306fa 100644
--- a/test/ruby/test_optimization.rb
+++ b/test/ruby/test_optimization.rb
@@ -424,4 +424,9 @@ class TestRubyOptimization < Test::Unit::TestCase
end
assert_nil result, '[ruby-dev:49423] [Bug #11804]'
end
+
+ def test_nil_safe_conditional_assign
+ bug11816 = '[ruby-core:74993] [Bug #11816]'
+ assert_ruby_status([], 'nil&.foo &&= false', bug11816)
+ end
end