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

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-01"
+channel = "nightly-2024-12-10"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 7442931d49b199ad0a1cc0f8ca54e327b5139b66"#;
+# commit_hash = a224f3807e58afc9353510f1d556c607d367545d"#;
 
 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/constant.rs

@@ -254,7 +254,7 @@ impl<'tcx> ConstCodegenMethods<'tcx> for CodegenCx<'tcx> {
                         (value, AddressSpace::DATA)
                     }
                     GlobalAlloc::Function { instance } => (
-                        self.get_fn_addr(instance.polymorphize(self.tcx)),
+                        self.get_fn_addr(instance),
                         self.data_layout().instruction_address_space,
                     ),
                     GlobalAlloc::VTable(vty, dyn_ty) => {

crates/rustc_codegen_spirv/src/lib.rs

@@ -151,7 +151,7 @@ use maybe_pqp_cg_ssa::{CodegenResults, CompiledModule, ModuleCodegen, ModuleKind
 use rspirv::binary::Assemble;
 use rustc_ast::expand::allocator::AllocatorKind;
 use rustc_data_structures::fx::FxIndexMap;
-use rustc_errors::{DiagCtxtHandle, ErrorGuaranteed, FatalError};
+use rustc_errors::{DiagCtxtHandle, FatalError};
 use rustc_metadata::EncodedMetadata;
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
 use rustc_middle::mir::mono::{MonoItem, MonoItemData};
@@ -310,12 +310,7 @@ impl CodegenBackend for SpirvCodegenBackend {
             .join(sess)
     }
 
-    fn link(
-        &self,
-        sess: &Session,
-        codegen_results: CodegenResults,
-        outputs: &OutputFilenames,
-    ) -> Result<(), ErrorGuaranteed> {
+    fn link(&self, sess: &Session, codegen_results: CodegenResults, outputs: &OutputFilenames) {
         let timer = sess.timer("link_crate");
         link::link(
             sess,
@@ -324,8 +319,6 @@ impl CodegenBackend for SpirvCodegenBackend {
             codegen_results.crate_info.local_crate_name.as_str(),
         );
         drop(timer);
-
-        sess.dcx().has_errors().map_or(Ok(()), Err)
     }
 }
 

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2024-12-01"
+channel = "nightly-2024-12-10"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 7442931d49b199ad0a1cc0f8ca54e327b5139b66
+# commit_hash = a224f3807e58afc9353510f1d556c607d367545d
 
 # 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/ui/dis/ptr_copy.normal.stderr

@@ -1,13 +1,13 @@
 error: cannot memcpy dynamically sized data
-    --> $CORE_SRC/intrinsics/mod.rs:4158:9
+    --> $CORE_SRC/intrinsics/mod.rs:4445:9
      |
-4158 |         copy(src, dst, count)
+4445 |         copy(src, dst, count)
      |         ^^^^^^^^^^^^^^^^^^^^^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics/mod.rs:4134:21
+    --> $CORE_SRC/intrinsics/mod.rs:4422:21
      |
-4134 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
+4422 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
      |                     ^^^^
 note: called by `ptr_copy::copy_via_raw_ptr`
     --> $DIR/ptr_copy.rs:28:18
@@ -28,27 +28,27 @@ note: called by `main`
 error: cannot cast between pointer types
        from `*f32`
          to `*struct () {  }`
-    --> $CORE_SRC/intrinsics/mod.rs:4146:9
+    --> $CORE_SRC/intrinsics/mod.rs:4433:9
      |
-4146 | /         ub_checks::assert_unsafe_precondition!(
-4147 | |             check_language_ub,
-4148 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
-4149 | |             (
+4433 | /         ub_checks::assert_unsafe_precondition!(
+4434 | |             check_language_ub,
+4435 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
+4436 | |             (
 ...    |
-4156 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
-4157 | |         );
+4443 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
+4444 | |         );
      | |_________^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics/mod.rs:4146:9
+    --> $CORE_SRC/intrinsics/mod.rs:4433:9
      |
-4146 | /         ub_checks::assert_unsafe_precondition!(
-4147 | |             check_language_ub,
-4148 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
-4149 | |             (
+4433 | /         ub_checks::assert_unsafe_precondition!(
+4434 | |             check_language_ub,
+4435 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
+4436 | |             (
 ...    |
-4156 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
-4157 | |         );
+4443 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
+4444 | |         );
      | |_________^
 note: called by `ptr_copy::copy_via_raw_ptr`
     --> $DIR/ptr_copy.rs:28:18