bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rustup to rustc 1.73.0-nightly (993deaa0b 2023-07-11)

Browse source
This commit is contained in:
bjorn3 2023-07-12 14:31:00 +00:00
parent 2922d41fa5
commit c28878d8f2
5 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build_system/tests.rs
View file

@ -125,8 +125,8 @@ pub(crate) static REGEX: CargoProject = CargoProject::new(&REGEX_REPO.source_dir
pub(crate) static PORTABLE_SIMD_REPO: GitRepo = GitRepo::github( pub(crate) static PORTABLE_SIMD_REPO: GitRepo = GitRepo::github(
"rust-lang", "rust-lang",
"portable-simd", "portable-simd",
"73d7eb5f73ba6abd3328c9c49c524d5f945498e0", "7c7dbe0c505ccbc02ff30c1e37381ab1d47bf46f",
"94498c03fa13ef6c", "5bcc9c544f6fa7bd",
"portable-simd", "portable-simd",
); );

16
patches/stdlib-lock.toml
View file

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "addr2line" name = "addr2line"
version = "0.19.0" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
dependencies = [ dependencies = [
"compiler_builtins", "compiler_builtins",
"gimli", "gimli",
@ -74,9 +74,9 @@ dependencies = [
[[package]] [[package]]
name = "compiler_builtins" name = "compiler_builtins"
version = "0.1.93" version = "0.1.95"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76630810d973ecea3dbf611e1b7aecfb1012751ef1ff8de3998f89014a166781" checksum = "6866e0f3638013234db3c89ead7a14d278354338e7237257407500009012b23f"
dependencies = [ dependencies = [
"cc", "cc",
"rustc-std-workspace-core", "rustc-std-workspace-core",
@ -193,9 +193,9 @@ dependencies = [
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.6.2" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [ dependencies = [
"adler", "adler",
"compiler_builtins", "compiler_builtins",
@ -205,9 +205,9 @@ dependencies = [
[[package]] [[package]]
name = "object" name = "object"
version = "0.30.4" version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
dependencies = [ dependencies = [
"compiler_builtins", "compiler_builtins",
"memchr", "memchr",

2
rust-toolchain
View file

@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "nightly-2023-06-28" channel = "nightly-2023-07-12"
components = ["rust-src", "rustc-dev", "llvm-tools"] components = ["rust-src", "rustc-dev", "llvm-tools"]

17
src/base.rs
View file

@ -177,18 +177,13 @@ pub(crate) fn compile_fn(
match module.define_function(codegened_func.func_id, context) { match module.define_function(codegened_func.func_id, context) {
Ok(()) => {} Ok(()) => {}
Err(ModuleError::Compilation(CodegenError::ImplLimitExceeded)) => { Err(ModuleError::Compilation(CodegenError::ImplLimitExceeded)) => {
// FIXME pass the error to the main thread and do a span_fatal instead let handler = rustc_session::EarlyErrorHandler::new(
rustc_session::early_error( rustc_session::config::ErrorOutputType::default(),
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
),
); );
handler.early_error(format!(
"backend implementation limit exceeded while compiling {name}",
name = codegened_func.symbol_name
));
} }
Err(err) => { Err(err) => {
panic!("Error while defining {name}: {err:?}", name = codegened_func.symbol_name); panic!("Error while defining {name}: {err:?}", name = codegened_func.symbol_name);

4
src/intrinsics/llvm_x86.rs
View file

@ -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 (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); let val = CValue::by_val_pair(cb_out, c, layout);
ret.write_cvalue(fx, val); 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 (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); let val = CValue::by_val_pair(cb_out, c, layout);
ret.write_cvalue(fx, val); ret.write_cvalue(fx, val);
} }