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

tests: accept some noise from LLVM 21 in symbols-all-mangled #138669

Merged
merged 1 commit into from
Mar 21, 2025
Merged

tests: accept some noise from LLVM 21 in symbols-all-mangled #138669

merged 1 commit into from
Mar 21, 2025
+14 −2

Conversation

durin42
Copy link
Contributor

@durin42 durin42 commented Mar 18, 2025 •
edited
Loading

I'm not entirely sure this is correct, but it doesn't feel obviously-wrong so I figured I'd just start by sending a PR rather than filing a bug and letting it linger.

@rustbot label llvm-main

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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 18, 2025
@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 2025

This PR modifies run-make tests.

cc @jieyouxu

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Mar 18, 2025
@bjorn3
Copy link
Member

bjorn3 commented Mar 18, 2025

Can you please remove the mention from the commit message. Github will ping me every time someone updates their repo after this PR gets merged.

bjorn3
bjorn3 reviewed Mar 18, 2025
View reviewed changes
tests/run-make/symbols-all-mangled/rmake.rs Outdated
continue;
}

if name.starts_with("_rust_extern_with_linkage___dso_handle.llvm") {
Copy link
Member

Choose a reason for hiding this comment

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

I think ignoring all symbols containing .llvm. is fine. The hash after it exists to prevent conflicts when thinLTO makes a symbol public.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

Copy link
Member

@bjorn3 bjorn3 Mar 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Forgot to push? Or did github get stuck in processing the push again?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

arg, got burned by git's horrible ux again, actually amended and pushed this time

@durin42 durin42 force-pushed the llvm-21-anon-func-unmangled branch 2 times, most recently from 79456d9 to c2c034a Compare March 18, 2025 15:53
@durin42
Copy link
Contributor Author

durin42 commented Mar 18, 2025

Can you please remove the mention from the commit message. Github will ping me every time someone updates their repo after this PR gets merged.

Lol that's horrible, fixed

@durin42 durin42 force-pushed the llvm-21-anon-func-unmangled branch from c2c034a to 2927f87 Compare March 18, 2025 16:03
@bjorn3
Copy link
Member

bjorn3 commented Mar 18, 2025

r=me with CI green.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@durin42 durin42 force-pushed the llvm-21-anon-func-unmangled branch from 2927f87 to 8ded2a8 Compare March 18, 2025 16:23
@durin42
Copy link
Contributor Author

durin42 commented Mar 18, 2025

https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/35579#0195aa17-6645-43e7-bce0-6d5ebdcd47b3 hm, still not working right. I'll look more in a bit.

@jieyouxu
Copy link
Member

I think you only ignored symbols containing .llvm. for the symbol_check_archive case but not also in the symbol_check case

@durin42 durin42 force-pushed the llvm-21-anon-func-unmangled branch from 8ded2a8 to af9f182 Compare March 20, 2025 14:06
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@durin42
tests: accept some noise from LLVM 21 in symbols-all-mangled
cafd238 
I'm not entirely sure this is correct, but it doesn't feel
obviously-wrong so I figured I'd just start by sending a PR rather than
filing a bug and letting it linger.

@rustbot label llvm-main
@durin42 durin42 force-pushed the llvm-21-anon-func-unmangled branch from af9f182 to cafd238 Compare March 20, 2025 15:36
@bjorn3
Copy link
Member

bjorn3 commented Mar 20, 2025

@bors r+

@bors
Copy link
Contributor

bors commented Mar 20, 2025

📌 Commit cafd238 has been approved by bjorn3

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 20, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 21, 2025
@matthiaskrgr
Rollup merge of rust-lang#138669 - durin42:llvm-21-anon-func-unmangle…
3c03c99 
…d, r=bjorn3

tests: accept some noise from LLVM 21 in symbols-all-mangled

I'm not entirely sure this is correct, but it doesn't feel obviously-wrong so I figured I'd just start by sending a PR rather than filing a bug and letting it linger.

`@rustbot` label llvm-main
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 21, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2025
@bors
Auto merge of rust-lang#138771 - matthiaskrgr:rollup-w8mnn3t, r=<try>
0c87514 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#138364 (ports the compiler test cases to new rust_intrinsic format)
 - rust-lang#138570 (add `naked_functions_target_feature` unstable feature)
 - rust-lang#138623 ([bootstrap] Use llvm_runtimes for compiler-rt)
 - rust-lang#138627 (Autodiff cleanups)
 - rust-lang#138669 (tests: accept some noise from LLVM 21 in symbols-all-mangled)
 - rust-lang#138706 (Improve bootstrap git modified path handling)
 - rust-lang#138709 (Update GCC submodule)
 - rust-lang#138717 (Add an attribute that makes the spans from a macro edition 2021, and fix pin on edition 2024 with it)
 - rust-lang#138721 (Use explicit cpu in some asm and codegen tests.)
 - rust-lang#138728 (Update `compiler-builtins` to 0.1.152)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: aarch64-apple
try-job: x86_64-msvc-1
try-job: x86_64-gnu
try-job: dist-i586-gnu-i586-i686-musl
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2025
@bors
Auto merge of rust-lang#138771 - matthiaskrgr:rollup-w8mnn3t, r=matth…
eadc761 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#138364 (ports the compiler test cases to new rust_intrinsic format)
 - rust-lang#138570 (add `naked_functions_target_feature` unstable feature)
 - rust-lang#138623 ([bootstrap] Use llvm_runtimes for compiler-rt)
 - rust-lang#138627 (Autodiff cleanups)
 - rust-lang#138669 (tests: accept some noise from LLVM 21 in symbols-all-mangled)
 - rust-lang#138706 (Improve bootstrap git modified path handling)
 - rust-lang#138709 (Update GCC submodule)
 - rust-lang#138717 (Add an attribute that makes the spans from a macro edition 2021, and fix pin on edition 2024 with it)
 - rust-lang#138721 (Use explicit cpu in some asm and codegen tests.)
 - rust-lang#138728 (Update `compiler-builtins` to 0.1.152)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: aarch64-apple
try-job: x86_64-msvc-1
try-job: x86_64-gnu
try-job: dist-i586-gnu-i586-i686-musl
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 21, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2025
@bors
Auto merge of rust-lang#138791 - matthiaskrgr:rollup-ev46cqr, r=matth…
be73c1f 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#138364 (ports the compiler test cases to new rust_intrinsic format)
 - rust-lang#138570 (add `naked_functions_target_feature` unstable feature)
 - rust-lang#138623 ([bootstrap] Use llvm_runtimes for compiler-rt)
 - rust-lang#138627 (Autodiff cleanups)
 - rust-lang#138669 (tests: accept some noise from LLVM 21 in symbols-all-mangled)
 - rust-lang#138706 (Improve bootstrap git modified path handling)
 - rust-lang#138709 (Update GCC submodule)
 - rust-lang#138717 (Add an attribute that makes the spans from a macro edition 2021, and fix pin on edition 2024 with it)
 - rust-lang#138721 (Use explicit cpu in some asm and codegen tests.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 015df66 into rust-lang:master Mar 21, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 21, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2025
@rust-timer
Unrolled build for rust-lang#138669
b351d88 
Rollup merge of rust-lang#138669 - durin42:llvm-21-anon-func-unmangled, r=bjorn3

tests: accept some noise from LLVM 21 in symbols-all-mangled

I'm not entirely sure this is correct, but it doesn't feel obviously-wrong so I figured I'd just start by sending a PR rather than filing a bug and letting it linger.

``@rustbot`` label llvm-main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

Assignees

@bjorn3 bjorn3

Labels
A-run-make Area: port run-make Makefiles to rmake.rs 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.87.0
Development

Successfully merging this pull request may close these issues.
6 participants
@durin42 @rustbot @bjorn3 @rust-log-analyzer @jieyouxu @bors