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

Fix type_diff logic after Alan pointed out errors

Browse source
This commit is contained in:
Maxime Chevalier-Boisvert 2021-04-01 10:43:54 -04:00 committed by Alan Wu
parent aee44e4f2b
commit 215a2f4010
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
yjit_core.c
View file

@ -146,22 +146,25 @@ int type_diff(val_type_t src, val_type_t dst)
RUBY_ASSERT(!src.is_heap || !src.is_imm); RUBY_ASSERT(!src.is_heap || !src.is_imm);
RUBY_ASSERT(!dst.is_heap || !dst.is_imm); RUBY_ASSERT(!dst.is_heap || !dst.is_imm);
if (src.type != dst.type && dst.type != ETYPE_UNKNOWN) // If dst assumes heap but src doesn't
if (dst.is_heap && !src.is_heap)
return INT_MAX; return INT_MAX;
if (src.is_heap && !dst.is_heap) // If dst assumes imm but src doesn't
if (dst.is_imm && !src.is_imm)
return INT_MAX; return INT_MAX;
if (src.is_imm && !dst.is_imm) // If dst assumes known type different from src
if (dst.type != ETYPE_UNKNOWN && dst.type != src.type)
return INT_MAX; return INT_MAX;
if (src.is_heap != dst.is_heap) if (dst.is_heap != src.is_heap)
return 1; return 1;
if (src.is_imm != dst.is_imm) if (dst.is_imm != src.is_imm)
return 1; return 1;
if (src.type != dst.type) if (dst.type != src.type)
return 1; return 1;
return 0; return 0;