diff options
| author | Stan Lo <stan.lo@shopify.com> | 2025-10-23 15:30:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-23 07:30:17 -0700 |
| commit | add78e76cedbe9ce430a0219dd80cbee734080b3 (patch) | |
| tree | 299efffe8f07f8b98b8b650b02ac33e8e7d158b3 | |
| parent | e529bf7d675506f744e44d2aafddc35aec84731d (diff) | |
ZJIT: Use iseq pointer directly in get/set class var codegen (#14921)
Addresses https://github.com/ruby/ruby/pull/14918#discussion_r2453802886
| -rw-r--r-- | zjit/src/codegen.rs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/zjit/src/codegen.rs b/zjit/src/codegen.rs index 029e144303..0a3be9277b 100644 --- a/zjit/src/codegen.rs +++ b/zjit/src/codegen.rs @@ -506,12 +506,9 @@ fn gen_get_ep(asm: &mut Assembler, level: u32) -> Opnd { fn gen_objtostring(jit: &mut JITState, asm: &mut Assembler, val: Opnd, cd: *const rb_call_data, state: &FrameState) -> Opnd { gen_prepare_non_leaf_call(jit, asm, state); - - let iseq_opnd = Opnd::Value(jit.iseq.into()); - // TODO: Specialize for immediate types // Call rb_vm_objtostring(iseq, recv, cd) - let ret = asm_ccall!(asm, rb_vm_objtostring, iseq_opnd, val, (cd as usize).into()); + let ret = asm_ccall!(asm, rb_vm_objtostring, VALUE(jit.iseq as usize).into(), val, (cd as usize).into()); // TODO: Call `to_s` on the receiver if rb_vm_objtostring returns Qundef // Need to replicate what CALL_SIMPLE_METHOD does @@ -836,16 +833,12 @@ fn gen_setivar(jit: &mut JITState, asm: &mut Assembler, recv: Opnd, id: ID, val: fn gen_getclassvar(jit: &mut JITState, asm: &mut Assembler, id: ID, ic: *const iseq_inline_cvar_cache_entry, state: &FrameState) -> Opnd { gen_prepare_non_leaf_call(jit, asm, state); - - let iseq = asm.load(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_ISEQ)); - asm_ccall!(asm, rb_vm_getclassvariable, iseq, CFP, id.0.into(), Opnd::const_ptr(ic)) + asm_ccall!(asm, rb_vm_getclassvariable, VALUE(jit.iseq as usize).into(), CFP, id.0.into(), Opnd::const_ptr(ic)) } fn gen_setclassvar(jit: &mut JITState, asm: &mut Assembler, id: ID, val: Opnd, ic: *const iseq_inline_cvar_cache_entry, state: &FrameState) { gen_prepare_non_leaf_call(jit, asm, state); - - let iseq = asm.load(Opnd::mem(64, CFP, RUBY_OFFSET_CFP_ISEQ)); - asm_ccall!(asm, rb_vm_setclassvariable, iseq, CFP, id.0.into(), val, Opnd::const_ptr(ic)); + asm_ccall!(asm, rb_vm_setclassvariable, VALUE(jit.iseq as usize).into(), CFP, id.0.into(), val, Opnd::const_ptr(ic)); } /// Look up global variables |