Replace ad-hoc ABI "adjustments" with an `AbiMap` to `CanonAbi` #141569

workingjubilee · 2025-05-26T05:40:28Z

Our conv_from_spec_abi, adjust_abi, and is_abi_supported combine to give us a very confusing way of reasoning about what actual calling convention we want to lower our code to and whether we want to compile the resulting code at all. Instead of leaving this code as a miniature adventure game in which someone tries to combine stateful mutations into a Rube Goldberg machine that will let them escape the maze and arrive at the promised land of codegen, we let AbiMap devour this complexity. Once you have an AbiMap, you can answer which ExternAbis will lower to what CanonAbis (and whether they will lower at all).

Removed:

conv_from_spec_abi replaced by AbiMap::canonize_abi
adjust_abi replaced by same
Conv::PreserveAll as unused
Conv::Cold as unused
enum Conv replaced by enum CanonAbi

target-spec.json changes:

If you have a target-spec.json then now your "entry-abi" key will be specified in terms of one of the "{abi}" strings Rust recognizes, e.g.

    "entry-abi": "C",
    "entry-abi": "win64",
    "entry-abi": "aapcs",

workingjubilee · 2025-05-26T05:44:14Z

I'd like to see you
@bors try

Replace ad-hoc ABI "adjustments" with an `AbiMap` to `CanonAbi` I am having second thoughts about some of my design choices, here, but I think it's useless to _internally_ debate them further. r? `@ghost` try-job: test-various try-job: aarch64-apple try-job: aarch64-gnu try-job: armhf-gnu try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: x86_64-mingw-1 try-job: x86_64-mingw-2 try-job: i686-msvc-1 try-job: i686-msvc-2

workingjubilee · 2025-05-26T06:22:31Z

I am foolish and impatient.
@bors try-
@bors try

bors · 2025-05-26T06:23:41Z

⌛ Trying commit e9817cc with merge 9938b8a...

Replace ad-hoc ABI "adjustments" with an `AbiMap` to `CanonAbi` I am having second thoughts about some of my design choices, here, but I think it's useless to _internally_ debate them further. r? `@ghost` try-job: test-various try-job: aarch64-apple try-job: aarch64-gnu try-job: armhf-gnu try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: x86_64-mingw-1 try-job: x86_64-mingw-2 try-job: i686-msvc-1 try-job: i686-msvc-2

compiler/rustc_abi/src/map.rs

bjorn3 · 2025-05-26T09:19:17Z

compiler/rustc_abi/src/canon_abi.rs

+
+    /// ABIs relevant to Windows or x86 targets
+    X86(X86Call),
+}


Ah so that decision actually does look right to someone who is not inside my head? Great.

compiler/rustc_target/src/spec/targets/i686_pc_windows_msvc.rs

workingjubilee · 2025-05-26T18:49:32Z

@bors try

bors · 2025-05-26T18:50:44Z

⌛ Trying commit 17fab7d with merge c4f8500...

Replace ad-hoc ABI "adjustments" with an `AbiMap` to `CanonAbi` I am having second thoughts about some of my design choices, here, but I think it's useless to _internally_ debate them further. r? `@ghost` try-job: test-various try-job: aarch64-apple try-job: aarch64-gnu try-job: armhf-gnu try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: x86_64-mingw-1 try-job: x86_64-mingw-2 try-job: i686-msvc-1 try-job: i686-msvc-2

workingjubilee · 2025-05-30T20:07:54Z

@bors2 try

rust-bors · 2025-05-30T20:07:57Z

⌛ Trying commit da98b14 with merge b508329…

Replace ad-hoc ABI "adjustments" with an `AbiMap` to `CanonAbi` Our `conv_from_spec_abi`, `adjust_abi`, and `is_abi_supported` combine to give us a very confusing way of reasoning about what _actual_ calling convention we want to lower our code to and whether we want to compile the resulting code at all. Instead of leaving this code as a miniature adventure game in which someone tries to combine stateful mutations into a Rube Goldberg machine that will let them escape the maze and arrive at the promised land of codegen, we let `AbiMap` devour this complexity. Once you have an `AbiMap`, you can answer which `ExternAbi`s will lower to what `CanonAbi`s (and whether they will lower at all). Removed: - `conv_from_spec_abi` replaced by `AbiMap::canonize_abi` - `adjust_abi` replaced by same - `Conv::PreserveAll` as unused - `Conv::Cold` as unused - `enum Conv` replaced by `enum CanonAbi` target-spec.json changes: - If you have a target-spec.json then now your "entry-abi" key will be specified in terms of one of the `"{abi}"` strings Rust recognizes, e.g. ```json "entry-abi": "C", "entry-abi": "win64", "entry-abi": "aapcs", ``` try-job: test-various try-job: aarch64-apple try-job: aarch64-gnu-debug try-job: arm-android try-job: armhf-gnu try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: x86_64-mingw-1 try-job: x86_64-mingw-2 try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: i686-mingw-1 try-job: i686-mingw-2

rust-bors · 2025-05-30T20:08:44Z

💔 Test failed

CI ❌

workingjubilee · 2025-05-30T20:10:49Z

oops, right, that's tier 2 now...

workingjubilee · 2025-05-30T20:10:58Z

@bors2 try

rust-bors · 2025-05-30T20:11:01Z

⌛ Trying commit da98b14 with merge 5527051…

Replace ad-hoc ABI "adjustments" with an `AbiMap` to `CanonAbi` Our `conv_from_spec_abi`, `adjust_abi`, and `is_abi_supported` combine to give us a very confusing way of reasoning about what _actual_ calling convention we want to lower our code to and whether we want to compile the resulting code at all. Instead of leaving this code as a miniature adventure game in which someone tries to combine stateful mutations into a Rube Goldberg machine that will let them escape the maze and arrive at the promised land of codegen, we let `AbiMap` devour this complexity. Once you have an `AbiMap`, you can answer which `ExternAbi`s will lower to what `CanonAbi`s (and whether they will lower at all). Removed: - `conv_from_spec_abi` replaced by `AbiMap::canonize_abi` - `adjust_abi` replaced by same - `Conv::PreserveAll` as unused - `Conv::Cold` as unused - `enum Conv` replaced by `enum CanonAbi` target-spec.json changes: - If you have a target-spec.json then now your "entry-abi" key will be specified in terms of one of the `"{abi}"` strings Rust recognizes, e.g. ```json "entry-abi": "C", "entry-abi": "win64", "entry-abi": "aapcs", ``` try-job: test-various try-job: aarch64-apple try-job: aarch64-gnu-debug try-job: arm-android try-job: armhf-gnu try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: x86_64-mingw-1 try-job: x86_64-mingw-2 try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: i686-gnu-1 try-job: i686-gnu-2

rust-bors · 2025-05-30T22:57:38Z

☀️ Try build successful

CI ✅
Build commit: 5527051 (552705171bcd9f242c39823a3a8b383699c82fdb)

workingjubilee · 2025-05-30T22:59:23Z

huzzah!

compiler/rustc_target/src/json.rs

src/tools/miri/src/shims/unix/android/foreign_items.rs

bjorn3 · 2025-05-31T13:24:31Z

compiler/rustc_abi/src/lib.rs

+    /// no "-unwind" variant
+    NoUnwind,


Maybe call this variant UnwindNotAllowed?

workingjubilee · 2025-05-31T17:29:32Z

doing some squashing

workingjubilee · 2025-05-31T18:22:41Z

found a tolerable way to wade through the formatting and fix all the import blocks in miri

- Add AbiMapping for encoding permissive mappings

makes entry_abi a lowering of the ABI string, so now it can be ```json "entry_abi": "C", "entry_abi": "win64", "entry_abi": "aapcs", ```

`adjust_abi` is not needed and `is_abi_supported` can be a 1-liner.

workingjubilee · 2025-05-31T19:39:40Z

ah, the Display change required touching miri again to fix the error message, sec

rustbot added O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) PG-exploit-mitigations Project group: Exploit mitigations T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 26, 2025

This comment was marked as outdated.

Sign in to view

This comment was marked as resolved.

Sign in to view

workingjubilee force-pushed the canonicalize-abi branch from 7e6762a to 71abc30 Compare May 26, 2025 06:06

This comment was marked as resolved.

Sign in to view

This comment was marked as outdated.

Sign in to view

workingjubilee force-pushed the canonicalize-abi branch from 71abc30 to e9817cc Compare May 26, 2025 06:21

This comment has been minimized.

Sign in to view

This comment was marked as outdated.

Sign in to view

This comment has been minimized.

Sign in to view

bjorn3 reviewed May 26, 2025

View reviewed changes

compiler/rustc_abi/src/map.rs Outdated Show resolved Hide resolved

bjorn3 reviewed May 26, 2025

View reviewed changes

This comment was marked as resolved.

Sign in to view

bjorn3 reviewed May 26, 2025

View reviewed changes

compiler/rustc_target/src/spec/targets/i686_pc_windows_msvc.rs Outdated Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

workingjubilee force-pushed the canonicalize-abi branch from 180ed85 to 17fab7d Compare May 26, 2025 18:46

workingjubilee removed PG-exploit-mitigations Project group: Exploit mitigations O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) labels May 26, 2025

bjorn3 reviewed May 31, 2025

View reviewed changes

compiler/rustc_target/src/json.rs Outdated Show resolved Hide resolved

bjorn3 reviewed May 31, 2025

View reviewed changes

workingjubilee force-pushed the canonicalize-abi branch 2 times, most recently from eff6b62 to 99fae05 Compare May 31, 2025 18:22

This comment has been minimized.

Sign in to view

workingjubilee added 11 commits May 31, 2025 12:36

compiler: add CanonAbi

f57ed46

compiler: add AbiMap

ace0d0d

- Add AbiMapping for encoding permissive mappings

compiler: use CanonAbi for entry_abi

ecfb051

makes entry_abi a lowering of the ABI string, so now it can be ```json "entry_abi": "C", "entry_abi": "win64", "entry_abi": "aapcs", ```

compiler: change Conv to CanonAbi

920154e

cg_llvm: convert to CanonAbi

36a485a

cg_clif: convert to CanonAbi

b357414

cg_gcc: convert to CanonAbi

239f07a

miri: sed to CanonAbi

77c125a

bless test for CanonAbi::X86(SysV64) change

65312d1

compiler: simplify TargetOptions ABI functions

1231137

`adjust_abi` is not needed and `is_abi_supported` can be a 1-liner.

compiler: actually remove Conv now that it is irrelevant

8eebba0

workingjubilee force-pushed the canonicalize-abi branch from 99fae05 to 8eebba0 Compare May 31, 2025 19:40

Replace ad-hoc ABI "adjustments" with an AbiMap to CanonAbi #141569

Are you sure you want to change the base?

Replace ad-hoc ABI "adjustments" with an AbiMap to CanonAbi #141569

Uh oh!

Conversation

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

Uh oh!

Uh oh!

workingjubilee commented May 26, 2025

Uh oh!

This comment was marked as outdated.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as outdated.

workingjubilee commented May 26, 2025

Uh oh!

bors commented May 26, 2025

Uh oh!

This comment has been minimized.

This comment was marked as outdated.

This comment has been minimized.

Uh oh!

bjorn3 May 26, 2025

Choose a reason for hiding this comment

Uh oh!

workingjubilee May 26, 2025

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

workingjubilee commented May 26, 2025

Uh oh!

bors commented May 26, 2025

Uh oh!

workingjubilee commented May 30, 2025

Uh oh!

rust-bors bot commented May 30, 2025

Uh oh!

rust-bors bot commented May 30, 2025

Uh oh!

workingjubilee commented May 30, 2025

Uh oh!

workingjubilee commented May 30, 2025

Uh oh!

rust-bors bot commented May 30, 2025

Uh oh!

rust-bors bot commented May 30, 2025

Uh oh!

workingjubilee commented May 30, 2025

Uh oh!

Uh oh!

Uh oh!

bjorn3 May 31, 2025

Choose a reason for hiding this comment

Uh oh!

workingjubilee commented May 31, 2025

Uh oh!

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

Uh oh!

Uh oh!

This comment has been minimized.

workingjubilee commented May 31, 2025

Uh oh!

Uh oh!

Replace ad-hoc ABI "adjustments" with an `AbiMap` to `CanonAbi` #141569

Replace ad-hoc ABI "adjustments" with an `AbiMap` to `CanonAbi` #141569

workingjubilee commented May 26, 2025 •

edited

Loading

workingjubilee commented May 31, 2025 •

edited

Loading