ZJIT: Propagate and count CompileError on exits #14408
Merged
+170
−106
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
k0kubun
force-pushed
the
zjit-failure-stats
branch
5 times, most recently
from
0956e53 to
22cf464
Compare
k0kubun
force-pushed
the
zjit-failure-stats
branch
from
22cf464 to
7c78022
Compare
XrXr
approved these changes
Sep 2, 2025
aidenfoxivey
reviewed
Sep 2, 2025
Comment on lines
+1643
to
+1648
| let code_ptr = match code_ptr { | ||
| Ok(code_ptr) => code_ptr, | ||
| Err(compile_error) => { | ||
| prepare_for_exit(iseq, cfp, sp, &compile_error); | ||
| ZJITState::get_exit_trampoline_with_counter() | ||
| } |
There was a problem hiding this comment.
Suggested change
| let code_ptr = match code_ptr { | |
| Ok(code_ptr) => code_ptr, | |
| Err(compile_error) => { | |
| prepare_for_exit(iseq, cfp, sp, &compile_error); | |
| ZJITState::get_exit_trampoline_with_counter() | |
| } | |
| let code_ptr = code_ptr.unwrap_or_else(|compile_error| { | |
| prepare_for_exit(iseq, cfp, sp, &compile_error); | |
| ZJITState::get_exit_trampoline_with_counter() | |
| }; |
This may be less line noise and more idiomatic
Comment on lines
+116
to
122
| let start_ptr = match gen_iseq(cb, iseq, Some(&function)) { | ||
| Ok(start_ptr) => start_ptr, | ||
| Err(err) => { | ||
| debug!("Failed to compile iseq: gen_iseq failed: {}", iseq_get_location(iseq, 0)); | ||
| return Err(err); | ||
| } | ||
| }; |
There was a problem hiding this comment.
Suggested change
| let start_ptr = match gen_iseq(cb, iseq, Some(&function)) { | |
| Ok(start_ptr) => start_ptr, | |
| Err(err) => { | |
| debug!("Failed to compile iseq: gen_iseq failed: {}", iseq_get_location(iseq, 0)); | |
| return Err(err); | |
| } | |
| }; | |
| let start_ptr = match gen_iseq(cb, iseq, Some(&function)) | |
| .inspect_err(|_| { | |
| debug!("Failed to compile iseq: gen_iseq failed: {}", iseq_get_location(iseq, 0)); | |
| })?; |
This is supported as of 1.76.0 and is slightly more idiomatic.
|
Ah whoops, was a bit late on submitting my comments. |
|
will file a separate PR to address them, thanks! |
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.
This PR propagates compile-error reasons all the way up and counts them at run-time instead of at compile time.
I also changed the order of
print_counters_with_prefixsinceunhandled_yarv_insn_isn't that important compared tocompile_error_at the moment, and placingexit_from the rest didn't seem useful. (past discussion)Example
On lobsters,