rustup: update to nightly-2024-12-15.

Author: eddyb

crates/rustc_codegen_spirv/build.rs

@@ -18,9 +18,9 @@ use std::{env, fs, mem};
 /// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
 //const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");
 const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
-channel = "nightly-2024-12-10"
+channel = "nightly-2024-12-15"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = a224f3807e58afc9353510f1d556c607d367545d"#;
+# commit_hash = 0aeaa5eb22180fdf12a8489e63c4daa18da6f236"#;
 
 fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
     let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());

crates/rustc_codegen_spirv/src/codegen_cx/mod.rs

@@ -975,8 +975,20 @@ impl<'tcx> AsmCodegenMethods<'tcx> for CodegenCx<'tcx> {
         _template: &[InlineAsmTemplatePiece],
         _operands: &[GlobalAsmOperandRef<'tcx>],
         _options: InlineAsmOptions,
-        _line_spans: &[Span],
+        line_spans: &[Span],
     ) {
-        todo!()
+        self.tcx.dcx().span_fatal(
+            line_spans.first().copied().unwrap_or_default(),
+            "[Rust-GPU] `global_asm!` not yet supported",
+        );
+    }
+
+    // FIXME(eddyb) should this method be implemented as just symbol mangling,
+    // or renamed upstream into something much more specific?
+    fn mangled_name(&self, instance: Instance<'tcx>) -> String {
+        self.tcx.dcx().span_bug(
+            self.tcx.def_span(instance.def_id()),
+            "[Rust-GPU] `#[naked] fn` not yet supported",
+        )
     }
 }

crates/rustc_codegen_spirv/src/lib.rs

@@ -218,7 +218,7 @@ impl CodegenBackend for SpirvCodegenBackend {
         rustc_errors::DEFAULT_LOCALE_RESOURCE
     }
 
-    fn target_features(&self, sess: &Session, _allow_unstable: bool) -> Vec<Symbol> {
+    fn target_features_cfg(&self, sess: &Session, _allow_unstable: bool) -> Vec<Symbol> {
         let cmdline = sess.opts.cg.target_feature.split(',');
         let cfg = sess.target.options.features.split(',');
         cfg.chain(cmdline)

crates/rustc_codegen_spirv/src/link.rs

@@ -427,11 +427,10 @@ fn add_upstream_rust_crates(
     codegen_results: &CodegenResults,
     crate_type: CrateType,
 ) {
-    let (_, data) = codegen_results
+    let data = codegen_results
         .crate_info
         .dependency_formats
-        .iter()
-        .find(|(ty, _)| *ty == crate_type)
+        .get(&crate_type)
         .expect("failed to find crate type in dependency format list");
     for &cnum in &codegen_results.crate_info.used_crates {
         let src = &codegen_results.crate_info.used_crate_source[&cnum];
@@ -451,11 +450,10 @@ fn add_upstream_native_libraries(
     codegen_results: &CodegenResults,
     crate_type: CrateType,
 ) {
-    let (_, data) = codegen_results
+    let data = codegen_results
         .crate_info
         .dependency_formats
-        .iter()
-        .find(|(ty, _)| *ty == crate_type)
+        .get(&crate_type)
         .expect("failed to find crate type in dependency format list");
 
     for &cnum in &codegen_results.crate_info.used_crates {

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2024-12-10"
+channel = "nightly-2024-12-15"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = a224f3807e58afc9353510f1d556c607d367545d
+# commit_hash = 0aeaa5eb22180fdf12a8489e63c4daa18da6f236
 
 # Whenever changing the nightly channel, update the commit hash above, and make
 # sure to change `REQUIRED_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` also.

tests/compiletests/ui/dis/issue-1062.stderr

@@ -4,7 +4,7 @@ OpLine %5 11 12
 %6 = OpLoad  %7  %8
 OpLine %5 11 35
 %9 = OpLoad  %7  %10
-OpLine %11 1199 4
+OpLine %11 1224 4
 %12 = OpBitwiseAnd  %7  %9 %13
 %14 = OpISub  %7  %15 %12
 %16 = OpShiftLeftLogical  %7  %6 %12

tests/compiletests/ui/dis/ptr_copy.normal.stderr

@@ -33,7 +33,6 @@ error: cannot cast between pointer types
 4433 | /         ub_checks::assert_unsafe_precondition!(
 4434 | |             check_language_ub,
 4435 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
-4436 | |             (
 ...    |
 4443 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
 4444 | |         );
@@ -45,7 +44,6 @@ note: used from within `core::intrinsics::copy::<f32>`
 4433 | /         ub_checks::assert_unsafe_precondition!(
 4434 | |             check_language_ub,
 4435 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
-4436 | |             (
 ...    |
 4443 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
 4444 | |         );

tests/compiletests/ui/dis/ptr_read.stderr

@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %5
 %6 = OpFunctionParameter  %5
 %7 = OpLabel
-OpLine %8 1374 8
+OpLine %8 1375 8
 %9 = OpLoad  %10  %4
 OpLine %11 7 13
 OpStore %6 %9

tests/compiletests/ui/dis/ptr_read_method.stderr

@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %5
 %6 = OpFunctionParameter  %5
 %7 = OpLabel
-OpLine %8 1374 8
+OpLine %8 1375 8
 %9 = OpLoad  %10  %4
 OpLine %11 7 13
 OpStore %6 %9

tests/compiletests/ui/dis/ptr_write.stderr

@@ -4,7 +4,7 @@
 %7 = OpLabel
 OpLine %8 7 35
 %9 = OpLoad  %10  %4
-OpLine %11 1578 8
+OpLine %11 1579 8
 OpStore %6 %9
 OpNoLine
 OpReturn