Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Itanium mangling usizes #122855

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Fix Itanium mangling usizes #122855

merged 1 commit into from
Mar 22, 2024

Conversation

workingjubilee
Copy link
Member

@workingjubilee workingjubilee commented Mar 22, 2024 •
edited
Loading

Arrays, surprisingly, are not sized to u64 on all platforms.

Fixes #122851.

r? @compiler-errors

cc @maurer

@workingjubilee
Fix Itanium mangling usizes
861e470 
Arrays, surprisingly, are not sized to u64 on all platforms.
@rustbot rustbot added PG-exploit-mitigations Project group: Exploit mitigations 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 22, 2024
@rustbot
Copy link
Collaborator

rustbot commented Mar 22, 2024

Some changes occurred in compiler/rustc_symbol_mangling/src/typeid

cc @rust-lang/project-exploit-mitigations, @rcvalle

@maurer
Copy link
Contributor

maurer commented Mar 22, 2024

LGTM. I'm guessing the confusion (I had this too when reading the code) was expecting that to_u64 extracted the integer value, and then ::from'd it into a u64 rather than assuming that the actual enum arm was u64.

@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 22, 2024

📌 Commit 861e470 has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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 22, 2024
@compiler-errors
Copy link
Member

compiler-errors commented Mar 22, 2024 •
edited
Loading

Would it be possible to validate this fixes your problem locally @maurer?

No need to block the PR since it's strictly more correct imo

@workingjubilee
Copy link
Member Author

LGTM. I'm guessing the confusion (I had this too when reading the code) was expecting that to_u64 extracted the integer value, and then ::from'd it into a u64 rather than assuming that the actual enum arm was u64.

slightly more complicated encoding: we shove all ints inside 16-byte arrays and then read them back out, but track what our size was. that code was actually one of the first places I ever touched in compiler PRs.

@maurer
Copy link
Contributor

maurer commented Mar 22, 2024 •
edited
Loading

Just confirmed that this removes the ICE in the build process that hit it originally.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 22, 2024
@matthiaskrgr
Rollup merge of rust-lang#122855 - workingjubilee:mangle-64-bit-chauv…
e5fcc6a 
…inism, r=compiler-errors

Fix Itanium mangling usizes

Arrays, surprisingly, are not sized to u64 on all platforms.

Fixes rust-lang#122851.

r? `@compiler-errors`

cc `@maurer`
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 22, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 22, 2024
@matthiaskrgr
Rollup merge of rust-lang#122855 - workingjubilee:mangle-64-bit-chauv…
b90eb2c 
…inism, r=compiler-errors

Fix Itanium mangling usizes

Arrays, surprisingly, are not sized to u64 on all platforms.

Fixes rust-lang#122851.

r? ``@compiler-errors``

cc ``@maurer``
This was referenced Mar 22, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2024
@bors
Auto merge of rust-lang#122869 - matthiaskrgr:rollup-0navj4l, r=matth…
1447f9d 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#121619 (Experimental feature postfix match)
 - rust-lang#122370 (Gracefully handle `AnonConst` in `diagnostic_hir_wf_check()`)
 - rust-lang#122537 (interpret/allocation: fix aliasing issue in interpreter and refactor getters a bit)
 - rust-lang#122542 (coverage: Clean up marker statements that aren't needed later)
 - rust-lang#122800 (Add `NonNull::<[T]>::is_empty`.)
 - rust-lang#122820 (Stop using `<DefId as Ord>` in various diagnostic situations)
 - rust-lang#122847 (Suggest `RUST_MIN_STACK` workaround on overflow)
 - rust-lang#122855 (Fix Itanium mangling usizes)
 - rust-lang#122863 (add more ice tests )

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3164a47 into rust-lang:master Mar 22, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Mar 22, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2024
@rust-timer
Unrolled build for rust-lang#122855
dcf4546 
Rollup merge of rust-lang#122855 - workingjubilee:mangle-64-bit-chauvinism, r=compiler-errors

Fix Itanium mangling usizes

Arrays, surprisingly, are not sized to u64 on all platforms.

Fixes rust-lang#122851.

r? ```@compiler-errors```

cc ```@maurer```
@workingjubilee workingjubilee deleted the mangle-64-bit-chauvinism branch March 22, 2024 17:16
flip1995 pushed a commit to flip1995/rust that referenced this pull request Apr 4, 2024
@bors
Auto merge of rust-lang#122869 - matthiaskrgr:rollup-0navj4l, r=matth…
879899c 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#121619 (Experimental feature postfix match)
 - rust-lang#122370 (Gracefully handle `AnonConst` in `diagnostic_hir_wf_check()`)
 - rust-lang#122537 (interpret/allocation: fix aliasing issue in interpreter and refactor getters a bit)
 - rust-lang#122542 (coverage: Clean up marker statements that aren't needed later)
 - rust-lang#122800 (Add `NonNull::<[T]>::is_empty`.)
 - rust-lang#122820 (Stop using `<DefId as Ord>` in various diagnostic situations)
 - rust-lang#122847 (Suggest `RUST_MIN_STACK` workaround on overflow)
 - rust-lang#122855 (Fix Itanium mangling usizes)
 - rust-lang#122863 (add more ice tests )

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maurer maurer maurer approved these changes

Assignees

@compiler-errors compiler-errors

Labels
PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.

CFI compilation of libcore on arm32 fails to encode array length
5 participants
@workingjubilee @rustbot @maurer @compiler-errors @bors