Skip to content

Call renumberMetadataForAssembly() in LLVMRustPrintModule() - #162236

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
zmodem:metadata_reordering
Sep 8, 2026
Merged

Call renumberMetadataForAssembly() in LLVMRustPrintModule()#162236
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
zmodem:metadata_reordering

Conversation

@zmodem

@zmodem zmodem commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

Some metadata got reordered in llvm/llvm-project#220390

@rustbot 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 Sep 3, 2026
@rustbot

rustbot commented Sep 3, 2026

Copy link
Copy Markdown
Collaborator

r? @mu001999

rustbot has assigned @mu001999.
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

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler
  • compiler expanded to 75 candidates
  • Random selection from 20 candidates

@zmodem

zmodem commented Sep 3, 2026

Copy link
Copy Markdown
Contributor Author

@rustbot label llvm-main

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Sep 3, 2026
@mu001999

mu001999 commented Sep 3, 2026

Copy link
Copy Markdown
Member

@rustbot reroll

@rustbot rustbot assigned jackh726 and unassigned mu001999 Sep 3, 2026
@zmodem

zmodem commented Sep 7, 2026

Copy link
Copy Markdown
Contributor Author

Discussion on llvm/llvm-project#220967 suggests maybe the order is not supposed to change...

cc @nikic and @yxsamliu

@nikic

nikic commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

I expect there will still be some changes, but yes, we should renumber before printing in LLVMRustPrintModule.

@zmodem
zmodem force-pushed the metadata_reordering branch from aa97bab to 0847dae Compare September 8, 2026 07:48
@rustbot rustbot added the A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. label Sep 8, 2026
@rustbot

rustbot commented Sep 8, 2026

Copy link
Copy Markdown
Collaborator

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.

@zmodem zmodem changed the title Update codegen-llvm tests to be less sensitive to metadata ordering Call renumberMetadataForAssembly() in LLVMRustPrintModule() Sep 8, 2026
@zmodem

zmodem commented Sep 8, 2026

Copy link
Copy Markdown
Contributor Author

I expect there will still be some changes, but yes, we should renumber before printing in LLVMRustPrintModule.

Thanks! That's much easier than trying to update the tests.

@nikic

nikic commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@rust-bors

rust-bors Bot commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0847dae has been approved by nikic

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 5. This pull request will be tested once the tree is reopened.

Reason for tree closure: spurious failures

@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 Sep 8, 2026
@JonathanBrouwer JonathanBrouwer mentioned this pull request Sep 8, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Sep 8, 2026
@bors
Auto merge of #162477 - JonathanBrouwer:rollup-xvTdfDi, r=JonathanBro…
b505807 
…uwer

Rollup of 12 pull requests

Successful merges:

 - #162462 (Fix unsoundness in `VecDeque::from_iter(vec::IntoIter)`)
 - #162468 (mir_build: Rename `lower_let_expr` to `lower_fallible_let`, and clarify)
 - #161806 (Add tests and docs for `#[derive(GenericTypeVisitable)]`)
 - #161912 (run `extern "tail"` with `byval` argument test)
 - #161932 (Only check `#[allow(dead_code)]` on the trait)
 - #162236 (Call renumberMetadataForAssembly() in LLVMRustPrintModule())
 - #162435 (windows-gnu: document libgcc requirement)
 - #162439 (Update books)
 - #162451 (Add regression test for item-local diagnostic attribute lint levels)
 - #162455 (Update codegen-llvm/inline-debuginfo.rs for distinct DILocation)
 - #162459 (docs(time): replace "method" with "function")
 - #162465 (Fix my duplicate thanks entry)
@rust-bors
rust-bors Bot merged commit e6e3455 into rust-lang:main Sep 8, 2026
13 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Sep 8, 2026
rust-bors Bot pushed a commit that referenced this pull request Sep 8, 2026
@bors
Unrolled build for #162236 in rollup 162477
e6bc496 
Rollup merge of #162236 - zmodem:metadata_reordering, r=nikic

Call renumberMetadataForAssembly() in LLVMRustPrintModule()

Some metadata got reordered in llvm/llvm-project#220390
github-actions Bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Sep 14, 2026
@bors
Auto merge of #162477 - JonathanBrouwer:rollup-xvTdfDi, r=JonathanBro…
f475273 
…uwer

Rollup of 12 pull requests

Successful merges:

 - rust-lang/rust#162462 (Fix unsoundness in `VecDeque::from_iter(vec::IntoIter)`)
 - rust-lang/rust#162468 (mir_build: Rename `lower_let_expr` to `lower_fallible_let`, and clarify)
 - rust-lang/rust#161806 (Add tests and docs for `#[derive(GenericTypeVisitable)]`)
 - rust-lang/rust#161912 (run `extern "tail"` with `byval` argument test)
 - rust-lang/rust#161932 (Only check `#[allow(dead_code)]` on the trait)
 - rust-lang/rust#162236 (Call renumberMetadataForAssembly() in LLVMRustPrintModule())
 - rust-lang/rust#162435 (windows-gnu: document libgcc requirement)
 - rust-lang/rust#162439 (Update books)
 - rust-lang/rust#162451 (Add regression test for item-local diagnostic attribute lint levels)
 - rust-lang/rust#162455 (Update codegen-llvm/inline-debuginfo.rs for distinct DILocation)
 - rust-lang/rust#162459 (docs(time): replace "method" with "function")
 - rust-lang/rust#162465 (Fix my duplicate thanks entry)
@github-actions github-actions Bot mentioned this pull request Oct 2, 2026
Merged
beckysiegel pushed a commit to chromium/chromium that referenced this pull request Oct 23, 2026
@andysjlim Chromium LUCI CQ
[rust] Remove obsolete crbug.com/556516031 cherry-picks in build_rust.py
4aeb02d 
In https://crrev.com/c/8587076, two temporary cherry-picks from
clang_packaging_cron.sh for crbug.com/556516031 were checked into
tools/rust/build_rust.py:
- c5c326ba7014 (rust-lang/rust#162230), which
  merged upstream on Sep 3, 2026 and is already in our pinned
  RUST_REVISION (8a9dd7abdf01).
- aa97bab747e2, an initial draft commit from
  rust-lang/rust#162236 that was later
  force-pushed and replaced by 0847dae70368 (merged on Sep 8, 2026,
  also already in our pinned RUST_REVISION).

Because aa97bab747e2 was superseded by 0847dae70368 before PR #162236
landed, `git merge-base --is-ancestor aa97bab747e2 HEAD` fails and
build_rust.py attempts to re-apply aa97bab747e2, which now fails with a
merge conflict in tests/codegen-llvm/debug-vtable.rs on the
*_upload_rust packaging bots after upstream Rust commit 03704177f51e
(rust-lang/rust#163104).

Remove both obsolete cherry-picks from GitApplyCherryPicks().

With the new rust revision at
https://chromium-review.git.corp.google.com/c/chromium/src/+/8608718,
all ToTRust bots were failing afterwards with cherry-pick errors.

Bug: 556516031, 576214311, 576655368
Change-Id: I0dd73071ead97b7545314db358fe55c5f438b050
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8628252
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1725581}
chromium-full-mirror-sync-agent Bot pushed a commit to chromium-full-mirror/chromium_src_tools_rust that referenced this pull request Oct 23, 2026
@andysjlim @copybara-github
[rust] Remove obsolete crbug.com/556516031 cherry-picks in build_rust.py
0e7b9d8 
In https://crrev.com/c/8587076, two temporary cherry-picks from
clang_packaging_cron.sh for crbug.com/556516031 were checked into
tools/rust/build_rust.py:
- c5c326ba7014 (rust-lang/rust#162230), which
  merged upstream on Sep 3, 2026 and is already in our pinned
  RUST_REVISION (8a9dd7abdf01).
- aa97bab747e2, an initial draft commit from
  rust-lang/rust#162236 that was later
  force-pushed and replaced by 0847dae70368 (merged on Sep 8, 2026,
  also already in our pinned RUST_REVISION).

Because aa97bab747e2 was superseded by 0847dae70368 before PR #162236
landed, `git merge-base --is-ancestor aa97bab747e2 HEAD` fails and
build_rust.py attempts to re-apply aa97bab747e2, which now fails with a
merge conflict in tests/codegen-llvm/debug-vtable.rs on the
*_upload_rust packaging bots after upstream Rust commit 03704177f51e
(rust-lang/rust#163104).

Remove both obsolete cherry-picks from GitApplyCherryPicks().

With the new rust revision at
https://chromium-review.git.corp.google.com/c/chromium/src/+/8608718,
all ToTRust bots were failing afterwards with cherry-pick errors.

Bug: 556516031, 576214311, 576655368
Change-Id: I0dd73071ead97b7545314db358fe55c5f438b050
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8628252
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1725581}
NOKEYCHECK=True
GitOrigin-RevId: 4aeb02d1665b9e14c5b40afbf174ba6e5b7fdca4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jackh726 jackh726

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) 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.100.0

Development

Successfully merging this pull request may close these issues.

5 participants

@zmodem @rustbot @mu001999 @nikic @jackh726