Skip to content

Use function shims to make sure EII works on apple targets #151733

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
Open
jdonszelmann wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use function shims to make sure EII works on apple targets #151733

jdonszelmann wants to merge 3 commits into from
+167 −22

Conversation

@jdonszelmann
Copy link
Contributor

@jdonszelmann jdonszelmann commented Jan 27, 2026 •
edited by oli-obk
Loading

Use function shims to make sure EII works on apple targets (and generally accepts target-arch attributes)

Explainer: #146348 (comment)
Tracking issue: #125418

@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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 Jan 27, 2026
@jdonszelmann jdonszelmann mentioned this pull request Jan 27, 2026
Open
48 tasks
@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Jan 27, 2026

@bors try jobs=aarch64-apple

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors bot pushed a commit that referenced this pull request Jan 27, 2026
@bors
Auto merge of #151733 - jdonszelmann:eii-on-apple, r=<try>
7d5270a 
Use function shims to make sure EII works on apple targets


try-job: aarch64-apple
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Jan 27, 2026

ah that's the rebase's fault

@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Jan 27, 2026

try build can still be interesting if the other test succeeds, but idk if we'll fail too fast, lemme rebase

@jdonszelmann jdonszelmann force-pushed the eii-on-apple branch 2 times, most recently from 14c4dda to 2fef4ab Compare January 27, 2026 12:17
@rustbot
Copy link
Collaborator

rustbot commented Jan 27, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Jan 27, 2026

@bors try cancel

@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Jan 27, 2026

@bors try jobs=aarch64-apple

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 27, 2026

Try build cancelled. Cancelled workflows:

rust-bors bot pushed a commit that referenced this pull request Jan 27, 2026
@bors
Auto merge of #151733 - jdonszelmann:eii-on-apple, r=<try>
8a39723 
Use function shims to make sure EII works on apple targets


try-job: aarch64-apple
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 27, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 27, 2026

💔 Test for 8a39723 failed: CI. Failed job:

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Jan 27, 2026

right, things are named differently, maybe we just shouldn't print that

@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Jan 27, 2026

@bors try jobs=aarch64-apple

rust-bors bot pushed a commit that referenced this pull request Jan 27, 2026
@bors
Auto merge of #151733 - jdonszelmann:eii-on-apple, r=<try>
4507d01 
Use function shims to make sure EII works on apple targets


try-job: aarch64-apple
@rust-bors

This comment has been minimized.

Sign in to view
@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Jan 27, 2026

doesn't need the envvars anymore now, but let's just run the try build

@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Jan 27, 2026

r? @bjorn3 (if you feel comfortable with this one?)

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 27, 2026

☀️ Try build successful (CI)
Build commit: 4507d01 (4507d01fee12a8bb1cf2e7920c372dc7c7cc984a, parent: 94a0cd15f5976fa35e5e6784e621c04e9f958e57)

@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Feb 2, 2026

@bjorn3 gentle reminder if this slipped off your radar. Could reassign if you'd rather someone else review it :)

@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Feb 2, 2026

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 2, 2026
@madsmtm madsmtm added the O-apple Operating system: Apple / Darwin (macOS, iOS, tvOS, visionOS, watchOS) label Feb 2, 2026
@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Feb 4, 2026

r? @oli-obk

@rustbot rustbot assigned oli-obk and unassigned bjorn3 Feb 4, 2026
@rustbot
Copy link
Collaborator

rustbot commented Feb 4, 2026

oli-obk is not on the review rotation at the moment.
They may take a while to respond.

oli-obk
oli-obk reviewed Feb 10, 2026
View reviewed changes
compiler/rustc_codegen_llvm/src/mono_item.rs
/// This does mean that the alias symbol has a different address than the original symbol
/// (assuming no optimizations by LLVM occur). This is unacceptable for statics.
/// So for statics we do want to use LLVM aliases, which is fine,
/// since for those we don't care about target architecture anyway.
Copy link
Contributor

@oli-obk oli-obk Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope that's true. The type and value can be target arch dependent, so wouldn't there need to be multiple versions anyway on macos?

Copy link
Contributor Author

@jdonszelmann jdonszelmann Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we support that. The only thing we need to make sure that for a given single architecture target, we put a target architecture annotation on every callable symbol so apple's linker is happy

oli-obk
oli-obk approved these changes Feb 10, 2026
View reviewed changes
Copy link
Contributor

@oli-obk oli-obk left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors r+

View changes since this review

@rust-bors
Copy link
Contributor

rust-bors bot commented Feb 10, 2026

📌 Commit acd2e87 has been approved by oli-obk

It is now in the queue for this repository.

@rust-bors rust-bors bot 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 Feb 10, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 10, 2026
@JonathanBrouwer
Rollup merge of rust-lang#151733 - jdonszelmann:eii-on-apple, r=oli-obk
fa00db4 
Use function shims to make sure EII works on apple targets

Use function shims to make sure EII works on apple targets (and generally accepts target-arch attributes)

Explainer: rust-lang#146348 (comment)
Tracking issue: rust-lang#125418
@JonathanBrouwer JonathanBrouwer mentioned this pull request Feb 10, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 10, 2026
@JonathanBrouwer
Rollup merge of rust-lang#151733 - jdonszelmann:eii-on-apple, r=oli-obk
a71ffaa 
Use function shims to make sure EII works on apple targets

Use function shims to make sure EII works on apple targets (and generally accepts target-arch attributes)

Explainer: rust-lang#146348 (comment)
Tracking issue: rust-lang#125418
@JonathanBrouwer JonathanBrouwer mentioned this pull request Feb 10, 2026
Closed
rust-bors bot pushed a commit that referenced this pull request Feb 10, 2026
@bors
Auto merge of #152451 - JonathanBrouwer:rollup-1mjEpG1, r=JonathanBro…
e1f5019 
…uwer

Rollup of 13 pull requests

Successful merges:

 - #149937 (try enabling `linker-messages` by default again)
 - #151733 (Use function shims to make sure EII works on apple targets)
 - #152120 (Don't ICE on layout error in vtable computation)
 - #152419 (Move more query system code)
 - #152431 (Restrict the set of things that const stability can be applied to)
 - #152436 (Reenable a GCI+mGCA+GCPT test case)
 - #151142 (Support ADT types in type info reflection)
 - #152021 (Bump tvOS, visionOS and watchOS Aarch64 targets to tier 2)
 - #152146 (mGCA: Add associated const type check)
 - #152372 (style: remove unneeded trailing commas)
 - #152383 (BikeshedGuaranteedNoDrop trait: add comments indicating that it can be observed on stable)
 - #152397 (Update books)
 - #152441 (Fix typos and grammar in top-level and src/doc documentation)
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 10, 2026
@matthiaskrgr
Rollup merge of rust-lang#151733 - jdonszelmann:eii-on-apple, r=oli-obk
c05b3b9 
Use function shims to make sure EII works on apple targets

Use function shims to make sure EII works on apple targets (and generally accepts target-arch attributes)

Explainer: rust-lang#146348 (comment)
Tracking issue: rust-lang#125418
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 10, 2026
Closed
@matthiaskrgr
Copy link
Member

matthiaskrgr commented Feb 11, 2026

@bors r-
#152454 (comment)

@rust-bors rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk approved these changes

Assignees

@oli-obk oli-obk

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. O-apple Operating system: Apple / Darwin (macOS, iOS, tvOS, visionOS, watchOS) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@jdonszelmann @rust-log-analyzer @rustbot @matthiaskrgr @oli-obk @madsmtm @bjorn3