Commit f3f68987 authored by Mazdak Farrokhzad's avatar Mazdak Farrokhzad Committed by GitHub

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

Remove invalid assertion back::link::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
parents 6c7ec18e a6e802ab
......@@ -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.
// Just need to tell the linker about where the library lives and
// what its name is
let parent = cratepath.parent();
-include ../
# Test that we don't run into an assertion when using a Rust dylib dependency
# while compiling with full LTO.
# See
$(RUSTC) --crate-type=dylib -C prefer-dynamic
$(RUSTC) -C lto
$(call RUN,main)
extern crate a_dylib;
fn main() {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment