-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Don't copy symbols from dylibs with -Zdylib-lto
#105800
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
// Auxiliary crate for test issue-105637: the LTOed dylib which had duplicate symbols from libstd, | ||
// breaking the panic hook feature. | ||
// | ||
// This simulates the `rustc_driver` crate, and the main crate simulates rustc's main binary hooking | ||
// into this driver. | ||
|
||
// compile-flags: -Zdylib-lto -C lto=thin | ||
|
||
use std::panic; | ||
|
||
pub fn main() { | ||
// Install the hook we want to see executed | ||
panic::set_hook(Box::new(|_| { | ||
eprintln!("LTOed auxiliary crate panic hook"); | ||
})); | ||
|
||
// Trigger the panic hook with an ICE | ||
run_compiler(); | ||
} | ||
|
||
fn run_compiler() { | ||
panic!("ICEing"); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// Regression test for issue #105637: `-Zdylib-lto` with LTO duplicated symbols from other dylibs, | ||
// in this case from libstd. | ||
// | ||
// That manifested as both `rustc_driver` and rustc's "main" (`compiler/rustc`) having their own | ||
// `std::panicking::HOOK` static, and the hook in rustc's main (the default stdlib's) being executed | ||
// when rustc ICEs, instead of the overriden hook from `rustc_driver` (which also displays the query | ||
// stack and information on how to open a GH issue for the encountered ICE). | ||
// | ||
// In this test, we reproduce this setup by installing a panic hook in both the main and an LTOed | ||
// dylib: the last hook set should be the one being executed, the dylib's. | ||
|
||
// aux-build: thinlto-dylib.rs | ||
// run-fail | ||
// check-run-results | ||
|
||
extern crate thinlto_dylib; | ||
|
||
use std::panic; | ||
|
||
fn main() { | ||
// We don't want to see this panic hook executed | ||
std::panic::set_hook(Box::new(|_| { | ||
eprintln!("main crate panic hook"); | ||
})); | ||
|
||
// Have the LTOed dylib install its own hook and panic, we want to see its hook executed. | ||
thinlto_dylib::main(); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
LTOed auxiliary crate panic hook |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.