Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d8b0069

Browse files
committedFeb 22, 2024
Auto merge of #121415 - matthiaskrgr:rollup-o9zzet4, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #121206 (Top level error handling) - #121261 (coverage: Remove `pending_dups` from the span refiner) - #121336 (triagebot: add queue notifications) - #121373 (Consistently refer to a test's `revision` instead of `cfg`) - #121391 (never patterns: Fix liveness analysis in the presence of never patterns) - #121392 (Unify dylib loading between proc macros and codegen backends) - #121399 (Solaris linker does not support --strip-debug) - #121406 (Add a couple tests) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3406ada + 35650a4 commit d8b0069

File tree

50 files changed

+452
-449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+452
-449
lines changed
 

‎Cargo.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4048,7 +4048,6 @@ dependencies = [
40484048
name = "rustc_interface"
40494049
version = "0.0.0"
40504050
dependencies = [
4051-
"libloading",
40524051
"rustc-rayon",
40534052
"rustc-rayon-core",
40544053
"rustc_ast",

‎compiler/rustc_codegen_ssa/src/back/link.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use rustc_ast::CRATE_NODE_ID;
33
use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
44
use rustc_data_structures::memmap::Mmap;
55
use rustc_data_structures::temp_dir::MaybeTempDir;
6-
use rustc_errors::{DiagCtxt, ErrorGuaranteed};
6+
use rustc_errors::{DiagCtxt, ErrorGuaranteed, FatalError};
77
use rustc_fs_util::{fix_windows_verbatim_for_gcc, try_canonicalize};
88
use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
99
use rustc_metadata::find_native_static_library;
@@ -487,7 +487,9 @@ fn collate_raw_dylibs<'a, 'b>(
487487
}
488488
}
489489
}
490-
sess.compile_status()?;
490+
if let Some(guar) = sess.dcx().has_errors() {
491+
return Err(guar);
492+
}
491493
Ok(dylib_table
492494
.into_iter()
493495
.map(|(name, imports)| {
@@ -720,10 +722,7 @@ fn link_dwarf_object<'a>(
720722
Ok(())
721723
}) {
722724
Ok(()) => {}
723-
Err(e) => {
724-
sess.dcx().emit_err(errors::ThorinErrorWrapper(e));
725-
sess.dcx().abort_if_errors();
726-
}
725+
Err(e) => sess.dcx().emit_fatal(errors::ThorinErrorWrapper(e)),
727726
}
728727
}
729728

@@ -999,7 +998,7 @@ fn link_natively<'a>(
999998
sess.dcx().emit_note(errors::CheckInstalledVisualStudio);
1000999
sess.dcx().emit_note(errors::InsufficientVSCodeProduct);
10011000
}
1002-
sess.dcx().abort_if_errors();
1001+
FatalError.raise();
10031002
}
10041003
}
10051004

0 commit comments

Comments
 (0)
Please sign in to comment.