зеркало из https://github.com/github/ruby.git
fix uninitialized memory reference.
* compile.c (iseq_set_sequence): clear kwargs (in ci_entries) memory area. kwargs ci entries are initialized by compiler. However, sometimes these initializations are skipped because corresponding calls are eliminated by some optimizations (for example, `if true` syntax elimnates else code). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
5570dba96f
Коммит
1d7247e694
|
@ -1939,6 +1939,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
|
|||
iseq->body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, iseq->body->is_size);
|
||||
iseq->body->ci_entries = (struct rb_call_info *)ruby_xmalloc(sizeof(struct rb_call_info) * iseq->body->ci_size +
|
||||
sizeof(struct rb_call_info_with_kwarg) * iseq->body->ci_kw_size);
|
||||
MEMZERO(iseq->body->ci_entries + iseq->body->ci_size, struct rb_call_info_with_kwarg, iseq->body->ci_kw_size); /* need to clear ci_kw entries */
|
||||
iseq->body->cc_entries = ZALLOC_N(struct rb_call_cache, iseq->body->ci_size + iseq->body->ci_kw_size);
|
||||
|
||||
ISEQ_COMPILE_DATA(iseq)->ci_index = ISEQ_COMPILE_DATA(iseq)->ci_kw_index = 0;
|
||||
|
|
|
@ -647,4 +647,19 @@ class TestRubyOptimization < Test::Unit::TestCase
|
|||
eval "def foo; 1.times{|(a), &b| nil && a}; end"
|
||||
END
|
||||
end
|
||||
|
||||
def test_clear_unreachable_keyword_args
|
||||
assert_separately [], <<-END
|
||||
script = <<-EOS
|
||||
if true
|
||||
else
|
||||
foo(k1:1)
|
||||
end
|
||||
EOS
|
||||
GC.stress = true
|
||||
30.times{
|
||||
RubyVM::InstructionSequence.compile(script)
|
||||
}
|
||||
END
|
||||
end
|
||||
end
|
||||
|
|
Загрузка…
Ссылка в новой задаче