Couple of test suite fixes for cg_clif #142955
Merged
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
Ensure rustc_codegen_cranelift doesn't get normalized to rustc. And handle -Cpanic=abort.
While cg_llvm is very lax about mismatched function signatures, cg_clif will crash when there is any mismatch. It could be turned into an error, but without Cranelift changes can't just be ignored.
cg_llvm likely just optimizes out their references for these tests, but cg_clif doesn't and would thus give a linker error.
|
r? @davidtwco rustbot has assigned @davidtwco. Use |
|
This PR modifies cc @jieyouxu |
bjorn3
commented
Jun 24, 2025
| _exception_class: u64, | ||
| _exception_object: *mut (), | ||
| _context: *mut (), | ||
| ) -> i32 { |
There was a problem hiding this comment.
This signature does technically depend on the exact unwinding mechanism used, but it is unlikely that cg_clif will support an unwinding mechanism that needs a different signature for the foreseeable future and cg_llvm doesn't care about signature mismatches anyway.
bjorn3
commented
Jun 24, 2025
| @@ -57,7 +57,8 @@ fn main() { | |||
| diff() | |||
| .expected_file("short-error.txt") | |||
| .actual_text("(linker error)", out.stderr()) | |||
| .normalize(r#"/rustc[^/]*/"#, "/rustc/") | |||
| .normalize(r#"/rustc[^/_-]*/"#, "/rustc/") | |||
There was a problem hiding this comment.
This doesn't exactly match the patch I had been carrying on the cg_clif side, but it should be more robust against future moves of the temp directory.
|
r? jieyouxu @bors r+ rollup |
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Jun 24, 2025
Couple of test suite fixes for cg_clif Most of these are required for getting the test suite running with panic=unwind for cg_clif.
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Jun 25, 2025
Couple of test suite fixes for cg_clif Most of these are required for getting the test suite running with panic=unwind for cg_clif.
This was referenced Jun 25, 2025
bors
added a commit
that referenced
this pull request
Jun 25, 2025
Rollup of 15 pull requests Successful merges: - #135731 (Implement parsing of pinned borrows) - #138780 (Add `#[loop_match]` for improved DFA codegen) - #142453 (Windows: make `read_dir` stop iterating after the first error is encountered) - #142633 (Error on invalid signatures for interrupt ABIs) - #142768 (Avoid a bitcast FFI call in transmuting) - #142825 (Port `#[track_caller]` to the new attribute system) - #142844 (Enable short-ice for Windows) - #142934 (Tweak `-Zmacro-stats` measurement.) - #142955 (Couple of test suite fixes for cg_clif) - #142977 (rustdoc: Don't mark `#[target_feature]` functions as ⚠) - #142980 (Reduce mismatched-lifetime-syntaxes suggestions to MaybeIncorrect) - #142982 (Corrected spelling mistake in c_str.rs) - #142983 (Taint body on invalid call ABI) - #142988 (Update wasm-component-ld to 0.5.14) - #142993 (Update cargo) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Jun 25, 2025
Rollup merge of #142955 - bjorn3:cg_clif_test_fixes, r=jieyouxu Couple of test suite fixes for cg_clif Most of these are required for getting the test suite running with panic=unwind for cg_clif.
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.
Most of these are required for getting the test suite running with panic=unwind for cg_clif.