diff options
author | Noah Gibbs <noah.gibbs@shopify.com> | 2022-06-01 15:22:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-01 10:22:08 -0400 |
commit | 9d18661e1de053a9fecae7f4ab4ed41300537cec (patch) | |
tree | 8ca0ebd67c1e9d5c715f308b3658e7c8fc99d797 /yjit | |
parent | 1177665e6224f8491db82997c8774e9485564e41 (diff) | |
download | ruby-9d18661e1de053a9fecae7f4ab4ed41300537cec.tar.gz |
Revert incorrect string-guard optimisation. (#5969)
Also add jhawthorn's test to for this bug.
Fix String#to_s invalidation test
Diffstat (limited to 'yjit')
-rw-r--r-- | yjit/src/codegen.rs | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs index 782d87a144..87639b9d88 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -3421,32 +3421,6 @@ fn jit_guard_known_klass( jit_chain_guard(JCC_JNE, jit, ctx, cb, ocb, max_chain_depth, side_exit); ctx.upgrade_opnd_type(insn_opnd, Type::Flonum); } - } else if unsafe { known_klass == rb_cString } && sample_instance.string_p() { - assert!(!val_type.is_imm()); - if val_type != Type::String { - assert!(val_type.is_unknown()); - - // Need the check for immediate, because trying to look up the klass field of an immediate will segfault - if !val_type.is_heap() { - add_comment(cb, "guard not immediate (for string)"); - assert!(Qfalse.as_i32() < Qnil.as_i32()); - test(cb, REG0, imm_opnd(RUBY_IMMEDIATE_MASK as i64)); - jit_chain_guard(JCC_JNZ, jit, ctx, cb, ocb, max_chain_depth, side_exit); - cmp(cb, REG0, imm_opnd(Qnil.into())); - jit_chain_guard(JCC_JBE, jit, ctx, cb, ocb, max_chain_depth, side_exit); - } - - add_comment(cb, "guard object is string"); - let klass_opnd = mem_opnd(64, REG0, RUBY_OFFSET_RBASIC_KLASS); - mov(cb, REG1, uimm_opnd(unsafe { rb_cString }.into())); - cmp(cb, klass_opnd, REG1); - jit_chain_guard(JCC_JNE, jit, ctx, cb, ocb, max_chain_depth, side_exit); - - // Upgrading here causes an error with invalidation writing past end of block - ctx.upgrade_opnd_type(insn_opnd, Type::String); - } else { - add_comment(cb, "skip guard - known to be a string"); - } } else if unsafe { FL_TEST(known_klass, VALUE(RUBY_FL_SINGLETON)) != VALUE(0) && sample_instance == rb_attr_get(known_klass, id__attached__ as ID) |