archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ZJIT: setglobal should not return output (#13744)

Browse source 
* ZJIT: setglobal should not return output

* Let the caller wrap Some
This commit is contained in:
Takashi Kokubun 2025-06-30 09:27:31 -07:00 • committed by GitHub
parent 81a2fdff1b
commit 44e4b02754
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/zjit-macos.yml vendored
View file

@ -108,6 +108,7 @@ jobs:
RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
../src/bootstraptest/test_attr.rb \
../src/bootstraptest/test_autoload.rb \
../src/bootstraptest/test_class.rb \
../src/bootstraptest/test_constant_cache.rb \
../src/bootstraptest/test_env.rb \
../src/bootstraptest/test_fiber.rb \
@ -128,7 +129,6 @@ jobs:
../src/bootstraptest/test_yjit_30k_methods.rb \
../src/bootstraptest/test_yjit_rust_port.rb
# ../src/bootstraptest/test_block.rb \
# ../src/bootstraptest/test_class.rb \
# ../src/bootstraptest/test_eval.rb \
# ../src/bootstraptest/test_exception.rb \
# ../src/bootstraptest/test_gc.rb \

2
.github/workflows/zjit-ubuntu.yml vendored
View file

@ -130,6 +130,7 @@ jobs:
RUST_BACKTRACE=1 ruby --disable=gems ../src/bootstraptest/runner.rb --ruby="./miniruby -I../src/lib -I. -I.ext/common --zjit-call-threshold=1" \
../src/bootstraptest/test_attr.rb \
../src/bootstraptest/test_autoload.rb \
../src/bootstraptest/test_class.rb \
../src/bootstraptest/test_constant_cache.rb \
../src/bootstraptest/test_env.rb \
../src/bootstraptest/test_fiber.rb \
@ -151,7 +152,6 @@ jobs:
../src/bootstraptest/test_yjit_30k_methods.rb \
../src/bootstraptest/test_yjit_rust_port.rb
# ../src/bootstraptest/test_block.rb \
# ../src/bootstraptest/test_class.rb \
# ../src/bootstraptest/test_eval.rb \
# ../src/bootstraptest/test_exception.rb \
# ../src/bootstraptest/test_gc.rb \

11
zjit/src/codegen.rs
View file

@ -278,7 +278,7 @@ fn gen_insn(cb: &mut CodeBlock, jit: &mut JITState, asm: &mut Assembler, functio
Insn::PatchPoint(_) => return Some(()), // For now, rb_zjit_bop_redefined() panics. TODO: leave a patch point and fix rb_zjit_bop_redefined()
Insn::CCall { cfun, args, name: _, return_type: _, elidable: _ } => gen_ccall(jit, asm, *cfun, args)?,
Insn::GetIvar { self_val, id, state: _ } => gen_getivar(asm, opnd!(self_val), *id),
Insn::SetGlobal { id, val, state: _ } => gen_setglobal(asm, *id, opnd!(val)),
Insn::SetGlobal { id, val, state: _ } => return Some(gen_setglobal(asm, *id, opnd!(val))),
Insn::GetGlobal { id, state: _ } => gen_getglobal(asm, *id),
&Insn::GetLocal { ep_offset, level } => gen_nested_getlocal(asm, ep_offset, level)?,
Insn::SetLocal { val, ep_offset, level } => return gen_nested_setlocal(asm, opnd!(val), *ep_offset, *level),
@ -294,7 +294,7 @@ fn gen_insn(cb: &mut CodeBlock, jit: &mut JITState, asm: &mut Assembler, functio
}
};
assert!(insn.has_output(), "Cannot write LIR output of HIR instruction with no output");
assert!(insn.has_output(), "Cannot write LIR output of HIR instruction with no output: {insn}");
// If the instruction has an output, remember it in jit.opnds
jit.opnds[insn_id.0] = Some(out_opnd);
@ -451,12 +451,9 @@ fn gen_getglobal(asm: &mut Assembler, id: ID) -> Opnd {
}
/// Set global variables
fn gen_setglobal(asm: &mut Assembler, id: ID, val: Opnd) -> Opnd {
fn gen_setglobal(asm: &mut Assembler, id: ID, val: Opnd) {
asm_comment!(asm, "call rb_gvar_set");
asm.ccall(
rb_gvar_set as *const u8,
vec![Opnd::UImm(id.0), val],
)
asm.ccall(rb_gvar_set as *const u8, vec![Opnd::UImm(id.0), val]);
}
/// Side-exit into the interpreter

2
zjit/src/hir.rs
View file

@ -1120,7 +1120,7 @@ impl Function {
| Insn::IfTrue { .. } | Insn::IfFalse { .. } | Insn::Return { .. }
| Insn::PatchPoint { .. } | Insn::SetIvar { .. } | Insn::ArrayExtend { .. }
| Insn::ArrayPush { .. } | Insn::SideExit { .. } | Insn::SetLocal { .. } =>
panic!("Cannot infer type of instruction with no output"),
panic!("Cannot infer type of instruction with no output: {}", self.insns[insn.0]),
Insn::Const { val: Const::Value(val) } => Type::from_value(*val),
Insn::Const { val: Const::CBool(val) } => Type::from_cbool(*val),
Insn::Const { val: Const::CInt8(val) } => Type::from_cint(types::CInt8, *val as i64),