Rollup merge of #59696 - michaelwoerister:fix-issue-59137, r=alexcrichton

Remove invalid assertion back:🔗:from add_upstream_rust_crates().

This removes a misplaced assertion. The function containing the assertion is actually only ever called for upstream crates that are not considered for LTO, so we don't care whether upstream code has been merged in by LTO or not.

Fixes #59137

r? @alexcrichton
This commit is contained in:
Mazdak Farrokhzad 2019-04-06 00:14:44 +02:00 committed by GitHub
commit f3f6898719
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 4 deletions

View file

@ -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();

View file

@ -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)

View file

@ -0,0 +1,4 @@
pub fn foo() {
println!("bar");
}

View file

@ -0,0 +1,6 @@
extern crate a_dylib;
fn main() {
a_dylib::foo();
}