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

Detach mapping to local in ctx_set_local_type

Browse source 
Similar to the previous fix to ctx_clear_local_types, we must detach
mappings to a local if we are changing its value.
This commit is contained in:
John Hawthorn 2021-08-10 15:41:27 -07:00 • committed by Alan Wu
parent 6d852e847e
commit ed8aa3409a
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bootstraptest/test_yjit.rb
View file

@ -1599,3 +1599,16 @@ assert_equal '10', %q{
val
}
# regression test of local type change
assert_equal '1.1', %q{
def bar(baz, quux)
if baz.integer?
baz, quux = quux, nil
end
baz.to_s
end
bar(123, 1.1)
bar(123, 1.1)
}

9
yjit_core.c
View file

@ -266,6 +266,15 @@ void ctx_set_local_type(ctx_t* ctx, size_t idx, val_type_t type)
if (idx >= MAX_LOCAL_TYPES)
return;
// If any values on the stack map to this local we must detach them
for (int i = 0; i < MAX_TEMP_TYPES; i++) {
temp_mapping_t *mapping = &ctx->temp_mapping[i];
if (mapping->kind == TEMP_LOCAL && mapping->idx == idx) {
ctx->temp_types[i] = ctx->local_types[mapping->idx];
*mapping = MAP_STACK;
}
}
ctx->local_types[idx] = type;
}