Skip to content

Commit 43b954a

Browse files
borsbors
committed
Auto merge of rust-lang#121332 - Nilstrieb:rollup-qwmc1i4, r=Nilstrieb
Rollup of 8 pull requests Successful merges: - rust-lang#121167 (resolve: Scale back unloading of speculatively loaded crates) - rust-lang#121196 (Always inline check in `assert_unsafe_precondition` with cfg(debug_assertions)) - rust-lang#121206 (Top level error handling) - rust-lang#121223 (intrinsics::simd: add missing functions) - rust-lang#121241 (Implement `NonZero` traits generically.) - rust-lang#121242 (Generate `getelementptr` instead of `inttoptr` for `ptr::invalid`) - rust-lang#121278 (Remove the "codegen" profile from bootstrap) - rust-lang#121286 (Rename `ConstPropLint` to `KnownPanicsLint`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents cce6a6e + 76a78ef commit 43b954a

File tree

55 files changed

+611
-447
lines changed

Some content is hidden

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

55 files changed

+611
-447
lines changed

Diff for: ‎compiler/rustc_ast_passes/src/ast_validation.rs

-1
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,6 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
881881
&item.vis,
882882
errors::VisibilityNotPermittedNote::TraitImpl,
883883
);
884-
// njn: use Dummy here
885884
if let TyKind::Err(_) = self_ty.kind {
886885
this.dcx().emit_err(errors::ObsoleteAuto { span: item.span });
887886
}

Diff for: ‎compiler/rustc_codegen_gcc/src/builder.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1727,7 +1727,7 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
17271727
self.vector_reduce(src, |a, b, context| context.new_binary_op(None, op, a.get_type(), a, b))
17281728
}
17291729

1730-
pub fn vector_reduce_fadd_fast(&mut self, _acc: RValue<'gcc>, _src: RValue<'gcc>) -> RValue<'gcc> {
1730+
pub fn vector_reduce_fadd_reassoc(&mut self, _acc: RValue<'gcc>, _src: RValue<'gcc>) -> RValue<'gcc> {
17311731
unimplemented!();
17321732
}
17331733

@@ -1747,7 +1747,7 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
17471747
unimplemented!();
17481748
}
17491749

1750-
pub fn vector_reduce_fmul_fast(&mut self, _acc: RValue<'gcc>, _src: RValue<'gcc>) -> RValue<'gcc> {
1750+
pub fn vector_reduce_fmul_reassoc(&mut self, _acc: RValue<'gcc>, _src: RValue<'gcc>) -> RValue<'gcc> {
17511751
unimplemented!();
17521752
}
17531753

Diff for: ‎compiler/rustc_codegen_gcc/src/intrinsic/simd.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -989,14 +989,14 @@ pub fn generic_simd_intrinsic<'a, 'gcc, 'tcx>(
989989

990990
arith_red!(
991991
simd_reduce_add_unordered: BinaryOp::Plus,
992-
vector_reduce_fadd_fast,
992+
vector_reduce_fadd_reassoc,
993993
false,
994994
add,
995995
0.0 // TODO: Use this argument.
996996
);
997997
arith_red!(
998998
simd_reduce_mul_unordered: BinaryOp::Mult,
999-
vector_reduce_fmul_fast,
999+
vector_reduce_fmul_reassoc,
10001000
false,
10011001
mul,
10021002
1.0

Diff for: ‎compiler/rustc_codegen_llvm/src/builder.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1327,17 +1327,17 @@ impl<'a, 'll, 'tcx> Builder<'a, 'll, 'tcx> {
13271327
pub fn vector_reduce_fmul(&mut self, acc: &'ll Value, src: &'ll Value) -> &'ll Value {
13281328
unsafe { llvm::LLVMRustBuildVectorReduceFMul(self.llbuilder, acc, src) }
13291329
}
1330-
pub fn vector_reduce_fadd_fast(&mut self, acc: &'ll Value, src: &'ll Value) -> &'ll Value {
1330+
pub fn vector_reduce_fadd_reassoc(&mut self, acc: &'ll Value, src: &'ll Value) -> &'ll Value {
13311331
unsafe {
13321332
let instr = llvm::LLVMRustBuildVectorReduceFAdd(self.llbuilder, acc, src);
1333-
llvm::LLVMRustSetFastMath(instr);
1333+
llvm::LLVMRustSetAllowReassoc(instr);
13341334
instr
13351335
}
13361336
}
1337-
pub fn vector_reduce_fmul_fast(&mut self, acc: &'ll Value, src: &'ll Value) -> &'ll Value {
1337+
pub fn vector_reduce_fmul_reassoc(&mut self, acc: &'ll Value, src: &'ll Value) -> &'ll Value {
13381338
unsafe {
13391339
let instr = llvm::LLVMRustBuildVectorReduceFMul(self.llbuilder, acc, src);
1340-
llvm::LLVMRustSetFastMath(instr);
1340+
llvm::LLVMRustSetAllowReassoc(instr);
13411341
instr
13421342
}
13431343
}

Diff for: ‎compiler/rustc_codegen_llvm/src/intrinsic.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1880,14 +1880,14 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
18801880
arith_red!(simd_reduce_mul_ordered: vector_reduce_mul, vector_reduce_fmul, true, mul, 1.0);
18811881
arith_red!(
18821882
simd_reduce_add_unordered: vector_reduce_add,
1883-
vector_reduce_fadd_fast,
1883+
vector_reduce_fadd_reassoc,
18841884
false,
18851885
add,
18861886
0.0
18871887
);
18881888
arith_red!(
18891889
simd_reduce_mul_unordered: vector_reduce_mul,
1890-
vector_reduce_fmul_fast,
1890+
vector_reduce_fmul_reassoc,
18911891
false,
18921892
mul,
18931893
1.0

Diff for: ‎compiler/rustc_codegen_llvm/src/llvm/ffi.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1618,6 +1618,7 @@ extern "C" {
16181618
) -> &'a Value;
16191619

16201620
pub fn LLVMRustSetFastMath(Instr: &Value);
1621+
pub fn LLVMRustSetAllowReassoc(Instr: &Value);
16211622

16221623
// Miscellaneous instructions
16231624
pub fn LLVMRustGetInstrProfIncrementIntrinsic(M: &Module) -> &Value;

Diff for: ‎compiler/rustc_codegen_ssa/src/back/link.rs

+6-7
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

Diff for: ‎compiler/rustc_codegen_ssa/src/base.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -449,10 +449,7 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
449449
let Some(llfn) = cx.declare_c_main(llfty) else {
450450
// FIXME: We should be smart and show a better diagnostic here.
451451
let span = cx.tcx().def_span(rust_main_def_id);
452-
let dcx = cx.tcx().dcx();
453-
dcx.emit_err(errors::MultipleMainFunctions { span });
454-
dcx.abort_if_errors();
455-
bug!();
452+
cx.tcx().dcx().emit_fatal(errors::MultipleMainFunctions { span });
456453
};
457454

458455
// `main` should respect same config for frame pointer elimination as rest of code

Diff for: ‎compiler/rustc_driver_impl/src/lib.rs

+18-21
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,6 @@ pub const EXIT_FAILURE: i32 = 1;
144144
pub const DEFAULT_BUG_REPORT_URL: &str = "https://github.com/rust-lang/rust/issues/new\
145145
?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md";
146146

147-
pub fn abort_on_err<T>(result: Result<T, ErrorGuaranteed>, sess: &Session) -> T {
148-
match result {
149-
Err(..) => {
150-
sess.dcx().abort_if_errors();
151-
panic!("error reported but abort_if_errors didn't abort???");
152-
}
153-
Ok(x) => x,
154-
}
155-
}
156-
157147
pub trait Callbacks {
158148
/// Called before creating the compiler instance
159149
fn config(&mut self, _config: &mut interface::Config) {}
@@ -349,27 +339,33 @@ fn run_compiler(
349339
},
350340
};
351341

352-
callbacks.config(&mut config);
353-
354-
default_early_dcx.abort_if_errors();
355342
drop(default_early_dcx);
356343

344+
callbacks.config(&mut config);
345+
357346
interface::run_compiler(config, |compiler| {
358347
let sess = &compiler.sess;
359348
let codegen_backend = &*compiler.codegen_backend;
360349

350+
// This is used for early exits unrelated to errors. E.g. when just
351+
// printing some information without compiling, or exiting immediately
352+
// after parsing, etc.
353+
let early_exit = || {
354+
if let Some(guar) = sess.dcx().has_errors() { Err(guar) } else { Ok(()) }
355+
};
356+
361357
// This implements `-Whelp`. It should be handled very early, like
362358
// `--help`/`-Zhelp`/`-Chelp`. This is the earliest it can run, because
363359
// it must happen after lints are registered, during session creation.
364360
if sess.opts.describe_lints {
365361
describe_lints(sess);
366-
return sess.compile_status();
362+
return early_exit();
367363
}
368364

369365
let early_dcx = EarlyDiagCtxt::new(sess.opts.error_format);
370366

371367
if print_crate_info(&early_dcx, codegen_backend, sess, has_input) == Compilation::Stop {
372-
return sess.compile_status();
368+
return early_exit();
373369
}
374370

375371
if !has_input {
@@ -378,16 +374,16 @@ fn run_compiler(
378374

379375
if !sess.opts.unstable_opts.ls.is_empty() {
380376
list_metadata(&early_dcx, sess, &*codegen_backend.metadata_loader());
381-
return sess.compile_status();
377+
return early_exit();
382378
}
383379

384380
if sess.opts.unstable_opts.link_only {
385381
process_rlink(sess, compiler);
386-
return sess.compile_status();
382+
return early_exit();
387383
}
388384

389385
let linker = compiler.enter(|queries| {
390-
let early_exit = || sess.compile_status().map(|_| None);
386+
let early_exit = || early_exit().map(|_| None);
391387
queries.parse()?;
392388

393389
if let Some(ppm) = &sess.opts.pretty {
@@ -659,10 +655,11 @@ fn process_rlink(sess: &Session, compiler: &interface::Compiler) {
659655
};
660656
}
661657
};
662-
let result = compiler.codegen_backend.link(sess, codegen_results, &outputs);
663-
abort_on_err(result, sess);
658+
if compiler.codegen_backend.link(sess, codegen_results, &outputs).is_err() {
659+
FatalError.raise();
660+
}
664661
} else {
665-
dcx.emit_fatal(RlinkNotAFile {})
662+
dcx.emit_fatal(RlinkNotAFile {});
666663
}
667664
}
668665

Diff for: ‎compiler/rustc_driver_impl/src/pretty.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
33
use rustc_ast as ast;
44
use rustc_ast_pretty::pprust as pprust_ast;
5+
use rustc_errors::FatalError;
56
use rustc_hir as hir;
67
use rustc_hir_pretty as pprust_hir;
78
use rustc_middle::bug;
@@ -18,7 +19,6 @@ use std::fmt::Write;
1819

1920
pub use self::PpMode::*;
2021
pub use self::PpSourceMode::*;
21-
use crate::abort_on_err;
2222

2323
struct AstNoAnn;
2424

@@ -243,7 +243,9 @@ impl<'tcx> PrintExtra<'tcx> {
243243

244244
pub fn print<'tcx>(sess: &Session, ppm: PpMode, ex: PrintExtra<'tcx>) {
245245
if ppm.needs_analysis() {
246-
abort_on_err(ex.tcx().analysis(()), sess);
246+
if ex.tcx().analysis(()).is_err() {
247+
FatalError.raise();
248+
}
247249
}
248250

249251
let (src, src_name) = get_source(sess);
@@ -334,7 +336,9 @@ pub fn print<'tcx>(sess: &Session, ppm: PpMode, ex: PrintExtra<'tcx>) {
334336
ThirTree => {
335337
let tcx = ex.tcx();
336338
let mut out = String::new();
337-
abort_on_err(rustc_hir_analysis::check_crate(tcx), tcx.sess);
339+
if rustc_hir_analysis::check_crate(tcx).is_err() {
340+
FatalError.raise();
341+
}
338342
debug!("pretty printing THIR tree");
339343
for did in tcx.hir().body_owners() {
340344
let _ = writeln!(out, "{:?}:\n{}\n", did, tcx.thir_tree(did));
@@ -344,7 +348,9 @@ pub fn print<'tcx>(sess: &Session, ppm: PpMode, ex: PrintExtra<'tcx>) {
344348
ThirFlat => {
345349
let tcx = ex.tcx();
346350
let mut out = String::new();
347-
abort_on_err(rustc_hir_analysis::check_crate(tcx), tcx.sess);
351+
if rustc_hir_analysis::check_crate(tcx).is_err() {
352+
FatalError.raise();
353+
}
348354
debug!("pretty printing THIR flat");
349355
for did in tcx.hir().body_owners() {
350356
let _ = writeln!(out, "{:?}:\n{}\n", did, tcx.thir_flat(did));

0 commit comments

Comments
 (0)