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.

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

Remove invalid assertion back::link::from add_upstream_rust_crates(). #59696

Merged
merged 2 commits into from
Apr 6, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/librustc_codegen_llvm/back/link.rs
Original file line number Diff line number Diff line change
@@ -1396,10 +1396,6 @@ fn add_upstream_rust_crates(cmd: &mut dyn Linker,

// Same thing as above, but for dynamic crates instead of static crates.
fn add_dynamic_crate(cmd: &mut dyn Linker, sess: &Session, cratepath: &Path) {
// If we're performing LTO, then it should have been previously required
// that all upstream rust dependencies were available in an rlib format.
assert!(!are_upstream_rust_objects_already_included(sess));

// Just need to tell the linker about where the library lives and
// what its name is
let parent = cratepath.parent();
10 changes: 10 additions & 0 deletions src/test/run-make-fulldeps/lto-dylib-dep/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
-include ../tools.mk

# Test that we don't run into an assertion when using a Rust dylib dependency
# while compiling with full LTO.
# See https://github.com/rust-lang/rust/issues/59137

all:
$(RUSTC) a_dylib.rs --crate-type=dylib -C prefer-dynamic
$(RUSTC) main.rs -C lto
$(call RUN,main)
4 changes: 4 additions & 0 deletions src/test/run-make-fulldeps/lto-dylib-dep/a_dylib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

pub fn foo() {
println!("bar");
}
6 changes: 6 additions & 0 deletions src/test/run-make-fulldeps/lto-dylib-dep/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

extern crate a_dylib;

fn main() {
a_dylib::foo();
}