compiler: add `ExternAbi::is_rustic_abi` by workingjubilee · Pull Request #138028 · rust-lang/rust

workingjubilee · 2025-03-05T02:26:41Z

Various parts of the compiler were hand-rolling this extremely simple check that is nonetheless easy to get wrong as the compiler evolves over time. Discourage them from being so "original" again by replacing it with a single implementation on the type that represents these ABIs. This simplifies a surprising amount of code as a result.

Also fixes #132981, an ICE that emerged due to other checks being made stricter.

no functional changes.

no functional changes

warns on fewer ABIs now

rustbot · 2025-03-05T02:26:44Z

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-03-05T02:26:46Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

compiler-errors · 2025-03-05T02:45:48Z

compiler/rustc_lint/src/types.rs

                debug!(?ty);
                if let hir::TyKind::BareFn(hir::BareFnTy { abi, .. }) = ty.kind
-                    && !self.visitor.is_internal_abi(*abi)
+                    && !abi.is_rustic_abi()


compiler-errors

Cool, good cleanups.

compiler-errors · 2025-03-05T02:46:03Z

r? compiler-errors

r=me when green

workingjubilee · 2025-03-05T03:38:34Z

oh, that was the one test suite I wasn't running locally...

workingjubilee · 2025-03-05T03:41:08Z

...just randomly fixed an ICE I guess?

expands some conditionals to include different "rustic" ABIs, so that we actually handle passing args through all "rustic" ABIs

workingjubilee · 2025-03-05T05:02:18Z

@bors r+

bors · 2025-03-05T05:02:20Z

📌 Commit 8a68987 has been approved by workingjubilee

It is now in the queue for this repository.

compiler-errors · 2025-03-05T05:02:47Z

compiler/rustc_ty_utils/src/abi.rs

    let tcx = cx.tcx();

-    if abi == ExternAbi::Rust || abi == ExternAbi::RustCall || abi == ExternAbi::RustIntrinsic {
+    if abi.is_rustic_abi() {


this was missing RustCold lmao

compiler-errors · 2025-03-05T05:02:56Z

compiler/rustc_ty_utils/src/abi.rs

-            || spec_abi == ExternAbi::RustCall
-            || spec_abi == ExternAbi::RustCold
-        {
+        if spec_abi.is_rustic_abi() {


This is missing RustIntrinsic, but I think that's ok?

yeah it was just checking that we don't put "weird" things into functions with these ABIs, so this just makes the check slightly stricter in a slightly irrelevant way because #132735 is the death sentence of the weird "rust-intrinsic" pseudo-ABI anyways.

compiler-errors · 2025-03-05T05:04:58Z

@bors r=compiler-errors

(approver lol)

bors · 2025-03-05T05:05:00Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Rollup of 6 pull requests #138021

bors · 2025-03-05T05:05:01Z

📌 Commit 8a68987 has been approved by compiler-errors

It is now in the queue for this repository.

…mpiler-errors compiler: add `ExternAbi::is_rustic_abi` Various parts of the compiler were hand-rolling this extremely simple check that is nonetheless easy to get wrong as the compiler evolves over time. Discourage them from being so "original" again by replacing it with a single implementation on the type that represents these ABIs. This simplifies a surprising amount of code as a result. Also fixes rust-lang#132981, an ICE that emerged due to other checks being made stricter.

…kingjubilee Rollup of 25 pull requests Successful merges: - rust-lang#134063 (dec2flt: Clean up float parsing modules) - rust-lang#136581 (Retire the legacy `Makefile`-based `run-make` test infra) - rust-lang#136662 (Count char width at most once in `Formatter::pad`) - rust-lang#136798 (Added documentation for flushing per rust-lang#74348) - rust-lang#137240 (Slightly reformat `std::fs::remove_dir_all` error docs) - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion) - rust-lang#137327 (Undeprecate env::home_dir) - rust-lang#137463 ([illumos] attempt to use posix_spawn to spawn processes) - rust-lang#137477 (uefi: Add Service Binding Protocol abstraction) - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var) - rust-lang#137569 (Stabilize `string_extend_from_within`) - rust-lang#137612 (Update bootstrap to edition 2024) - rust-lang#137633 (Only use implied bounds hack if bevy, and use deeply normalize in implied bounds hack) - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums) - rust-lang#137679 (Various coretests improvements) - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`) - rust-lang#137758 (fix usage of ty decl macro fragments in attributes) - rust-lang#137764 (Ensure that negative auto impls are always applicable) - rust-lang#137772 (Fix char count in `Display` for `ByteStr`) - rust-lang#137798 (ci: use ubuntu 24 on arm large runner) - rust-lang#137805 (adjust Layout debug printing to match the internal field name) - rust-lang#137808 (Do not require that unsafe fields lack drop glue) - rust-lang#137820 (Clarify why InhabitedPredicate::instantiate_opt exists) - rust-lang#137825 (Provide more context on resolve error caused from incorrect RTN) - rust-lang#138028 (compiler: add `ExternAbi::is_rustic_abi`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 20 pull requests Successful merges: - rust-lang#134063 (dec2flt: Clean up float parsing modules) - rust-lang#136581 (Retire the legacy `Makefile`-based `run-make` test infra) - rust-lang#136662 (Count char width at most once in `Formatter::pad`) - rust-lang#136764 (Make `ptr_cast_add_auto_to_object` lint into hard error) - rust-lang#136798 (Added documentation for flushing per rust-lang#74348) - rust-lang#136865 (Perform deeper compiletest path normalization for `$TEST_BUILD_DIR` to account for compare-mode/debugger cases, and normalize long type file filename hashes) - rust-lang#136975 (Look for `python3` first on MacOS, not `py`) - rust-lang#136977 (Upload Datadog metrics with citool) - rust-lang#137240 (Slightly reformat `std::fs::remove_dir_all` error docs) - rust-lang#137298 (Check signature WF when lowering MIR body) - rust-lang#137463 ([illumos] attempt to use posix_spawn to spawn processes) - rust-lang#137477 (uefi: Add Service Binding Protocol abstraction) - rust-lang#137569 (Stabilize `string_extend_from_within`) - rust-lang#137633 (Only use implied bounds hack if bevy, and use deeply normalize in implied bounds hack) - rust-lang#137679 (Various coretests improvements) - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`) - rust-lang#137728 (Remove unsizing coercions for tuples) - rust-lang#137731 (Resume one waiter at once in deadlock handler) - rust-lang#137875 (mir_build: Integrate "simplification" steps into match-pair-tree creation) - rust-lang#138028 (compiler: add `ExternAbi::is_rustic_abi`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#138028 - workingjubilee:is-rustic-abi, r=compiler-errors compiler: add `ExternAbi::is_rustic_abi` Various parts of the compiler were hand-rolling this extremely simple check that is nonetheless easy to get wrong as the compiler evolves over time. Discourage them from being so "original" again by replacing it with a single implementation on the type that represents these ABIs. This simplifies a surprising amount of code as a result. Also fixes rust-lang#132981, an ICE that emerged due to other checks being made stricter.

workingjubilee added 4 commits March 4, 2025 18:21

compiler: add ExternAbi::is_rustic_abi

1f32f7b

compiler: use is_rustic_abi in mir_transform

08b5783

no functional changes.

compiler: use is_rustic_abi in ImproperCTypesVisitor

5abf36b

no functional changes

compiler: use is_rustic_abi in abi_check

e81fbe3

warns on fewer ABIs now

rustbot assigned lcnr Mar 5, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 5, 2025

compiler-errors reviewed Mar 5, 2025

View reviewed changes

compiler-errors approved these changes Mar 5, 2025

View reviewed changes

rustbot assigned compiler-errors and unassigned lcnr Mar 5, 2025

workingjubilee force-pushed the is-rustic-abi branch 2 times, most recently from c3f2cec to 1d07a39 Compare March 5, 2025 03:54

compiler: use is_rustic_abi in ty_utils

8a68987

expands some conditionals to include different "rustic" ABIs, so that we actually handle passing args through all "rustic" ABIs

workingjubilee force-pushed the is-rustic-abi branch from 1d07a39 to 8a68987 Compare March 5, 2025 03:57

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2025

compiler-errors reviewed Mar 5, 2025

View reviewed changes

workingjubilee mentioned this pull request Mar 5, 2025

Rollup of 25 pull requests #138044

Closed

jieyouxu mentioned this pull request Mar 5, 2025

Rollup of 20 pull requests #138058

Merged

bors merged commit fe4c085 into rust-lang:master Mar 5, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Mar 5, 2025

workingjubilee deleted the is-rustic-abi branch March 5, 2025 19:33

workingjubilee restored the is-rustic-abi branch May 31, 2025 20:00

workingjubilee deleted the is-rustic-abi branch June 10, 2025 21:51

Uh oh!

Conversation

workingjubilee commented Mar 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Mar 5, 2025

Uh oh!

rustbot commented Mar 5, 2025

Uh oh!

compiler-errors Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

compiler-errors left a comment

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Mar 5, 2025

Uh oh!

workingjubilee commented Mar 5, 2025

Uh oh!

workingjubilee commented Mar 5, 2025

Uh oh!

workingjubilee commented Mar 5, 2025

Uh oh!

bors commented Mar 5, 2025

Uh oh!

compiler-errors Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

compiler-errors Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

workingjubilee Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Mar 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Mar 5, 2025

Uh oh!

bors commented Mar 5, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

workingjubilee commented Mar 5, 2025 •

edited

Loading

compiler-errors commented Mar 5, 2025 •

edited

Loading