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

libunwind: readd link attrs to _Unwind_Backtrace #93350

Merged
merged 1 commit into from
Mar 7, 2022
Merged

libunwind: readd link attrs to _Unwind_Backtrace #93350

merged 1 commit into from
Mar 7, 2022

Conversation

gburgessiv
Copy link
Contributor

It seems the removal of these in 1c07096 was unintended; readding them fixes the build.

fixes #93349

r? @alexcrichton

@gburgessiv
libunwind: readd link attrs to _Unwind_Backtrace
4d25c51 
It seems the removal of these in
1c07096 was unintended; readding them
fixes the build.

fixes rust-lang#93349
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 26, 2022
@alexcrichton
Copy link
Member

I'm under the impression that on Unix-style platforms #[link] doesn't need to be repeated beyond one block at most, so I'm not actually sure why the build would be failing before and succeeding afterwards. I realize that this may fix things but do you know why it fixes things?

@gburgessiv
Copy link
Contributor Author

Hm, I'd naively assumed that it was somehow directly associated with the extern block it preceded. I'll dig a bit deeper to figure out what exactly this is changing, then. :)

@petrochenkov
Copy link
Contributor

I'm under the impression that on Unix-style platforms #[link] doesn't need to be repeated beyond one block at most

See the FIXME above in the same file.
Unfortunately someone thought it was a good idea to include this information into heuristics for reexporting symbols from dylibs.

@alexcrichton
Copy link
Member

I apologize @gburgessiv but you'll need to find a new reviewer for this as I'm going to recuse myself. If I'm going to be passive-aggressively insulted when I try to help out it's not worth my time.

@petrochenkov
Copy link
Contributor

@alexcrichton
If this is about my comment, then no insult was intended, there's literally a FIXME in the file describing the issue in detail. That logic in the compiler is old, I didn't know who implemented it.

@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 6, 2022
@Dylan-DPC
Copy link
Member

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+

I think this makes sense for now, though I agree we should have a clearer story around names referenced with intent to export as the comment in the file suggests.

@bors
Copy link
Contributor

bors commented Mar 7, 2022

📌 Commit 4d25c51 has been approved by Mark-Simulacrum

@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 7, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 7, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 7, 2022
@bors
Auto merge of rust-lang#94706 - matthiaskrgr:rollup-l5erynr, r=matthi…
03918ba 
…askrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#93350 (libunwind: readd link attrs to _Unwind_Backtrace)
 - rust-lang#93827 (Stabilize const_fn_fn_ptr_basics, const_fn_trait_bound, and const_impl_trait)
 - rust-lang#94696 (Remove whitespaces and use CSS to align line numbers to the right instead)
 - rust-lang#94700 (rustdoc: Update minifier version)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@gburgessiv
Copy link
Contributor Author

Oops -- sorry this fell off my radar. :) Thank you all!

@bors bors merged commit 1ca8d0b into rust-lang:master Mar 7, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 7, 2022
flip1995 pushed a commit to flip1995/rust that referenced this pull request Mar 14, 2022
@bors
Auto merge of rust-lang#94706 - matthiaskrgr:rollup-l5erynr, r=matthi…
d3bc129 
…askrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#93350 (libunwind: readd link attrs to _Unwind_Backtrace)
 - rust-lang#93827 (Stabilize const_fn_fn_ptr_basics, const_fn_trait_bound, and const_impl_trait)
 - rust-lang#94696 (Remove whitespaces and use CSS to align line numbers to the right instead)
 - rust-lang#94700 (rustdoc: Update minifier version)

Failed merges:

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
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.61.0
Development

Successfully merging this pull request may close these issues.

rustc fails to build with in-tree libunwind and lld
9 participants
@gburgessiv @alexcrichton @petrochenkov @Dylan-DPC @Mark-Simulacrum @bors @JohnCSimon @rust-highfive @rustbot