Skip to content

Couple of minor cleanups #145004

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.

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Aug 6, 2025

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Aug 6, 2025

r? @petrochenkov

rustbot has assigned @petrochenkov.
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 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 Aug 6, 2025
@rustbot
Copy link
Collaborator

rustbot commented Aug 6, 2025

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

These commits modify compiler targets.
(See the Target Tier Policy.)

@WaffleLapkin
Copy link
Member

r=me with green ci
r? WaffleLapkin

@rustbot rustbot assigned WaffleLapkin and unassigned petrochenkov Aug 6, 2025
@bjorn3
Copy link
Member Author

bjorn3 commented Aug 6, 2025

@bors r=WaffleLapkin

@bors
Copy link
Collaborator

bors commented Aug 6, 2025

📌 Commit 6fbea4f has been approved by WaffleLapkin

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 Aug 6, 2025
@bjorn3
Copy link
Member Author

bjorn3 commented Aug 6, 2025

cc #117364 which removed embedding of LLVM bitcode on Apple platforms.

Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 7, 2025
Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 7, 2025
bors added a commit that referenced this pull request Aug 7, 2025
Rollup of 20 pull requests

Successful merges:

 - #137831 (Tweak auto trait errors)
 - #143028 (emit `StorageLive` and schedule `StorageDead` for `let`-`else`'s bindings after matching)
 - #143764 (lower pattern bindings in the order they're written and base drop order on primary bindings' order)
 - #143808 (Port `#[should_panic]` to the new attribute parsing infrastructure )
 - #143906 (Miri: non-deterministic floating point operations in `foreign_items`)
 - #143929 (Mark all deprecation lints in name resolution as deny-by-default and report-in-deps)
 - #144133 (Stabilize const TypeId::of)
 - #144439 (Introduce ModernIdent type to unify macro 2.0 hygiene handling)
 - #144473 (Address libunwind.a inconsistency issues in the bootstrap program)
 - #144659 (bootstrap: refactor mingw dist and fix gnullvm)
 - #144705 (compiler-builtins: plumb LSE support for aarch64 on linux/gnu when optimized-compiler-builtins not enabled)
 - #144807 (Streamline config in bootstrap)
 - #144900 (Stabilize `unsigned_signed_diff` feature)
 - #144903 (Rename `begin_panic_handler` to `panic_handler`)
 - #144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC)
 - #144974 (compiler-builtins subtree update)
 - #144997 (bump bootstrap compiler to 1.90 beta)
 - #145004 (Couple of minor cleanups)
 - #145009 (A couple small changes for rust-analyzer next-solver work)
 - #145014 (Revert "Preserve the .debug_gdb_scripts section")

r? `@ghost`
`@rustbot` modify labels: rollup
Comment on lines 1113 to 1116

let llconst = common::bytes_in_context(llcx, cmdline.as_bytes());
let llglobal = llvm::add_global(llmod, common::val_ty(llconst), c"rustc.embedded.cmdline");
llvm::set_initializer(llglobal, llconst);
Copy link
Contributor

Choose a reason for hiding this comment

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

Commit says about removing bitcode_llvm_cmdline for apple platform, but if guarded by aix and wasm too?

Copy link
Member Author

Choose a reason for hiding this comment

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

It has never been used outside of Apple platforms in the first place afaik. Apple platforms were the only ones where bitcode_llvm_cmdline got set to a non-empty value.

tgross35 added a commit to tgross35/rust that referenced this pull request Aug 7, 2025
bors added a commit that referenced this pull request Aug 7, 2025
Rollup of 8 pull requests

Successful merges:

 - #144705 (compiler-builtins: plumb LSE support for aarch64 on linux/gnu when optimized-compiler-builtins not enabled)
 - #144857 (Port `#[allow_internal_unsafe]` to the new attribute system)
 - #144900 (Stabilize `unsigned_signed_diff` feature)
 - #144903 (Rename `begin_panic_handler` to `panic_handler`)
 - #144974 (compiler-builtins subtree update)
 - #145004 (Couple of minor cleanups)
 - #145007 (Fix build/doc/test of error index generator)
 - #145018 (Derive `Hash` for rustc_public types)

r? `@ghost`
`@rustbot` modify labels: rollup
tgross35 added a commit to tgross35/rust that referenced this pull request Aug 7, 2025
@tgross35
Copy link
Contributor

tgross35 commented Aug 8, 2025

@bors r-
@bors2 try jobs=x86_64-apple-2

Thinking this could be the "Object file with bitcode missing"error in #145063 (comment)

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 8, 2025
@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 8, 2025
@rust-bors
Copy link

rust-bors bot commented Aug 8, 2025

⌛ Trying commit 6fbea4f with merge 0203e79

To cancel the try build, run the command @bors try cancel.

rust-bors bot added a commit that referenced this pull request Aug 8, 2025
Couple of minor cleanups

try-job: x86_64-apple-2
@rust-log-analyzer

This comment has been minimized.

@rust-bors
Copy link

rust-bors bot commented Aug 8, 2025

💔 Test failed (CI). Failed jobs:

It used to be necessary on Apple platforms to ship with the App Store,
but XCode 15 has stopped embedding LLVM bitcode and the App Store no
longer accepts apps with bitcode embedded.
@bjorn3
Copy link
Member Author

bjorn3 commented Aug 8, 2025

On macOS the linker rejects object files with bitcode but missing cmdline. I changed it to keep the cmdline on all platforms, just always empty.

= note: ld: in /Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib/libcompiler_builtins-5de5c4c90ca8f717.rlib(compiler_builtins-5de5c4c90ca8f717.compiler_builtins.abc1b0ccfdbf58c6-cgu.000.rcgu.o), Object file with bitcode missing cmdline options: /Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib/libcompiler_builtins-5de5c4c90ca8f717.rlib(compiler_builtins-5de5c4c90ca8f717.compiler_builtins.abc1b0ccfdbf58c6-cgu.000.rcgu.o) file '/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib/libcompiler_builtins-5de5c4c90ca8f717.rlib'

@bjorn3
Copy link
Member Author

bjorn3 commented Aug 8, 2025

@rustbot ready

@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 Aug 8, 2025
@bjorn3 bjorn3 force-pushed the remove_unused_fields branch from 6fbea4f to 8f648d7 Compare August 8, 2025 11:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants