diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-07-12 14:31:00 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-07-12 14:31:00 +0000 |
| commit | c28878d8f2fbb1b00baa6f6475fb3ffc0fb9e57c (patch) | |
| tree | d1c204e57bcd5bb481a4903a7d4b3b085d64023d /src | |
| parent | 2922d41fa5f01e699d47e3b1676ecf0ccb960648 (diff) | |
| download | rust-c28878d8f2fbb1b00baa6f6475fb3ffc0fb9e57c.tar.gz rust-c28878d8f2fbb1b00baa6f6475fb3ffc0fb9e57c.zip | |
Rustup to rustc 1.73.0-nightly (993deaa0b 2023-07-11)
Diffstat (limited to 'src')
| -rw-r--r-- | src/base.rs | 17 | ||||
| -rw-r--r-- | src/intrinsics/llvm_x86.rs | 4 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/base.rs b/src/base.rs index edffa769718..8403093861c 100644 --- a/src/base.rs +++ b/src/base.rs @@ -177,18 +177,13 @@ pub(crate) fn compile_fn( match module.define_function(codegened_func.func_id, context) { Ok(()) => {} Err(ModuleError::Compilation(CodegenError::ImplLimitExceeded)) => { - // FIXME pass the error to the main thread and do a span_fatal instead - rustc_session::early_error( - rustc_session::config::ErrorOutputType::HumanReadable( - rustc_errors::emitter::HumanReadableErrorType::Default( - rustc_errors::emitter::ColorConfig::Auto, - ), - ), - format!( - "backend implementation limit exceeded while compiling {name}", - name = codegened_func.symbol_name - ), + let handler = rustc_session::EarlyErrorHandler::new( + rustc_session::config::ErrorOutputType::default(), ); + handler.early_error(format!( + "backend implementation limit exceeded while compiling {name}", + name = codegened_func.symbol_name + )); } Err(err) => { panic!("Error while defining {name}: {err:?}", name = codegened_func.symbol_name); diff --git a/src/intrinsics/llvm_x86.rs b/src/intrinsics/llvm_x86.rs index 61dac0cce8b..6d07788149c 100644 --- a/src/intrinsics/llvm_x86.rs +++ b/src/intrinsics/llvm_x86.rs @@ -531,7 +531,7 @@ pub(crate) fn codegen_x86_llvm_intrinsic_call<'tcx>( let (cb_out, c) = llvm_add_sub(fx, BinOp::Add, c_in, a, b); - let layout = fx.layout_of(fx.tcx.mk_tup(&[fx.tcx.types.u8, a.layout().ty])); + let layout = fx.layout_of(Ty::new_tup(fx.tcx, &[fx.tcx.types.u8, a.layout().ty])); let val = CValue::by_val_pair(cb_out, c, layout); ret.write_cvalue(fx, val); } @@ -550,7 +550,7 @@ pub(crate) fn codegen_x86_llvm_intrinsic_call<'tcx>( let (cb_out, c) = llvm_add_sub(fx, BinOp::Sub, b_in, a, b); - let layout = fx.layout_of(fx.tcx.mk_tup(&[fx.tcx.types.u8, a.layout().ty])); + let layout = fx.layout_of(Ty::new_tup(fx.tcx, &[fx.tcx.types.u8, a.layout().ty])); let val = CValue::by_val_pair(cb_out, c, layout); ret.write_cvalue(fx, val); } |