Rollup of 3 pull requests #150448
Merged
Rollup of 3 pull requests #150448
+338
−43
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
Closes rust-lang#125364 This test verifies that the never type fallback behavior in try blocks with `Into<!>` bounds works correctly across different editions: - Edition 2021: Fallback to `()` causes type error - Edition 2024: Fallback to `!` compiles successfully
Intrinsics only need a fraction of the functionality offered by BuilderMethods::call and in particular don't need the FnAbi to be computed other than (currently) as step towards computing the function value type.
This moves all LLVM intrinsic handling out of the regular call path for cg_gcc and makes it easier to hook into this code for future cg_llvm changes.
As this is the only unwinding intrinsic we use and codegen_llvm_intrinsic_call currently doesn't handle unwinding intrinsics, this uses the conventional call path for llvm.wasm.throw.
…ndling, r=WaffleLapkin Split LLVM intrinsic abi handling from the rest of the abi handling LLVM intrinsics have weird requirements like requiring the fake "unadjusted" abi, not being callable through function pointers and for all codegen backends other than cg_llvm requiring special cases to redirect them to the correct backend specific intrinsic (or directly codegen their implementation inline without any intrinsic call). By splitting the LLVM intrinsic handling it becomes easier for backends to special case them and should in the future allow getting rid of the abi calculation for `extern "unadjusted"` in favor of computing the correct abi directly in the backend without depending on the exact way cg_ssa lowers types.
…m, r=oli-obk
fix rustfmt on `const impl Ty {}`
r? `@oli-obk` on rust-lang#148434, cc `@ytmimi` for https://github.com/rust-lang/rust/pull/148434/changes#r2637972310
format_constness_right outputs `" const"` whereas format_constness outputs `"const "`
Not making this change to rust-lang/rustfmt since I'm not sure if that repo has these changes yet.
…y-blocks, r=WaffleLapkin Add test for never type fallback in try blocks with `Into<!>` ### Summary Adds UI tests for issue rust-lang#125364, which involves the interaction between never type fallback, try blocks, and `From`/`Into` trait bounds. ### Changes - Added `tests/ui/never_type/try-block-never-type-fallback.rs` - Tests both edition 2021 (where the issue manifests) and edition 2024 (where it's fixed) ### Issue Closes rust-lang#125364 ### Testing ```bash ./x test tests/ui/never_type/try-block-never-type-fallback.rs ``` Both test variants pass: e2021: Correctly fails with expected error e2024: Compiles successfully (check-pass) ### Notes This test documents the edition-dependent behavior of never type fallback in try blocks, as requested in the original issue. cc `@WaffleLapkin`
rustbot
added
A-LLVM
Member
Author
|
@bors r+ rollup=never p=5 |
Collaborator
bors
added
S-waiting-on-bors
Collaborator
Collaborator
|
☀️ Test successful - checks-actions |
Collaborator
|
📌 Perf builds for each rolled up PR:
previous master: 7b5cde7370 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
Contributor
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing 7b5cde7 (parent) -> 23d01cd (this PR) Test differencesShow 7 test diffsStage 1
Stage 2
Additionally, 3 doctest diffs were found. These are ignored, as they are noisy. Job group index
Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 23d01cd2412583491621ab1ca4f1b01e37d11e39 --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
Collaborator
|
Finished benchmarking commit (23d01cd): comparison URL. Overall result: ❌ regressions - no action needed@rustbot label: -perf-regression Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)This benchmark run did not return any relevant results for this metric. CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 484.246s -> 484.138s (-0.02%) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Successful merges:
const impl Ty {}#150358 (fix rustfmt onconst impl Ty {})Into<!>#150434 (Add test for never type fallback in try blocks withInto<!>)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup