rustup: update to nightly-2025-01-03 (~1.85).

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-25"
+channel = "nightly-2025-01-03"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 409998c4e8cae45344fd434b358b697cc93870d0"#;
+# commit_hash = 4363f9b6f6d3656d94adbcabba6348a485ef9a56"#;
 
 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/lib.rs

@@ -150,6 +150,7 @@ use maybe_pqp_cg_ssa::traits::{
 use maybe_pqp_cg_ssa::{CodegenResults, CompiledModule, ModuleCodegen, ModuleKind};
 use rspirv::binary::Assemble;
 use rustc_ast::expand::allocator::AllocatorKind;
+use rustc_ast::expand::autodiff_attrs::AutoDiffItem;
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_errors::{DiagCtxtHandle, FatalError};
 use rustc_metadata::EncodedMetadata;
@@ -390,6 +391,16 @@ impl WriteBackendMethods for SpirvCodegenBackend {
     fn serialize_module(module: ModuleCodegen<Self::Module>) -> (String, Self::ModuleBuffer) {
         (module.name, SpirvModuleBuffer(module.module_llvm))
     }
+
+    fn autodiff(
+        _cgcx: &CodegenContext<Self>,
+        _tcx: TyCtxt<'_>,
+        _module: &ModuleCodegen<Self::Module>,
+        _diff_fncs: Vec<AutoDiffItem>,
+        _config: &ModuleConfig,
+    ) -> Result<(), FatalError> {
+        todo!()
+    }
 }
 
 impl ExtraBackendMethods for SpirvCodegenBackend {

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2024-12-25"
+channel = "nightly-2025-01-03"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 409998c4e8cae45344fd434b358b697cc93870d0
+# commit_hash = 4363f9b6f6d3656d94adbcabba6348a485ef9a56
 
 # 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 1224 4
+OpLine %11 1094 4
 %12 = OpBitwiseAnd  %7  %9 %13
 %14 = OpISub  %7  %15 %12
 %16 = OpShiftLeftLogical  %7  %6 %12

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

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

tests/compiletests/ui/dis/ptr_read.stderr

@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %5
 %6 = OpFunctionParameter  %5
 %7 = OpLabel
-OpLine %8 1375 8
+OpLine %8 1385 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 1375 8
+OpLine %8 1385 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 1579 8
+OpLine %11 1587 8
 OpStore %6 %9
 OpNoLine
 OpReturn

tests/compiletests/ui/dis/ptr_write_method.stderr

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

tests/compiletests/ui/lang/core/unwrap_or.stderr

@@ -3,9 +3,9 @@
 OpLine %5 13 11
 %6 = OpCompositeInsert  %7  %8 %9 0
 %10 = OpCompositeExtract  %11  %6 1
-OpLine %12 993 14
+OpLine %12 999 14
 %13 = OpBitcast  %14  %8
-OpLine %12 993 8
+OpLine %12 999 8
 %15 = OpIEqual  %16  %13 %17
 OpNoLine
 OpSelectionMerge %18 None