ZJIT: Remove more Option from codegen #14265
Open
+11
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
segfault in not-ZJIT :( |
k0kubun
reviewed
Aug 18, 2025
| @@ -1184,7 +1180,7 @@ fn gen_guard_type(jit: &mut JITState, asm: &mut Assembler, val: lir::Opnd, guard | |||
| // Static symbols have (val & 0xff) == RUBY_SYMBOL_FLAG | |||
| // Use 8-bit comparison like YJIT does | |||
| debug_assert!(val.try_num_bits(8).is_some(), "GuardType should not be used for a known constant, but val was: {val:?}"); | |||
| asm.cmp(val.try_num_bits(8)?, Opnd::UImm(RUBY_SYMBOL_FLAG as u64)); | |||
| asm.cmp(val.try_num_bits(8).unwrap(), Opnd::UImm(RUBY_SYMBOL_FLAG as u64)); | |||
There was a problem hiding this comment.
If we have an HIR validator for GuardType not using known operands and we're going to unwrap this, let's remove the try_num_bits function from Opnd and use with_num_bits(8) instead.
k0kubun
reviewed
Aug 18, 2025
| } | ||
|
|
||
| fn gen_invokebuiltin(jit: &JITState, asm: &mut Assembler, state: &FrameState, bf: &rb_builtin_function, args: Vec<Opnd>) -> lir::Opnd { | ||
| assert!(bf.argc + 2 <= C_ARG_OPNDS.len() as i32, "Builtin function {} has too many arguments: {}", unsafe { std::ffi::CStr::from_ptr(bf.name).to_str().unwrap() }, bf.argc); |
There was a problem hiding this comment.
There's no such guarantee. You shouldn't crash just because a Primitive takes 5+ arguments.
There was a problem hiding this comment.
Oh, you're checking it on gen_insn. I hope the panic message explains that it should not happen because it's checked by the caller gen_insn. There's nothing wrong in "Builtin function {} has too many arguments" itself.
There was a problem hiding this comment.
e.g.
Suggested change
| assert!(bf.argc + 2 <= C_ARG_OPNDS.len() as i32, "Builtin function {} has too many arguments: {}", unsafe { std::ffi::CStr::from_ptr(bf.name).to_str().unwrap() }, bf.argc); | |
| assert!( | |
| bf.argc + 2 <= C_ARG_OPNDS.len() as i32, | |
| "gen_invokebuiltin should not be called for builtin function {} with too many arguments: {}", | |
| unsafe { std::ffi::CStr::from_ptr(bf.name).to_str().unwrap() }, bf.argc, | |
| ); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.