rustup: update to nightly-2025-01-24.

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-2025-01-13"
+channel = "nightly-2025-01-24"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 48a426eca9df23b24b3559e545cf88dee61d4de9"#;
+# commit_hash = 99768c80a1c094a5cfc3b25a04e7a99de7210eae"#;
 
 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

@@ -116,6 +116,9 @@ impl<'tcx> ConstCodegenMethods<'tcx> for CodegenCx<'tcx> {
     fn const_undef(&self, ty: Self::Type) -> Self::Value {
         self.undef(ty)
     }
+    fn is_undef(&self, v: Self::Value) -> bool {
+        matches!(self.builder.lookup_const(v), Some(SpirvConst::Undef))
+    }
     fn const_poison(&self, ty: Self::Type) -> Self::Value {
         // No distinction between undef and poison.
         self.const_undef(ty)

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2025-01-13"
+channel = "nightly-2025-01-24"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 48a426eca9df23b24b3559e545cf88dee61d4de9
+# commit_hash = 99768c80a1c094a5cfc3b25a04e7a99de7210eae
 
 # 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/ptr_copy.normal.stderr

@@ -1,13 +1,13 @@
 error: cannot memcpy dynamically sized data
-    --> $CORE_SRC/intrinsics/mod.rs:4460:9
+    --> $CORE_SRC/intrinsics/mod.rs:4472:9
      |
-4460 |         copy(src, dst, count)
+4472 |         copy(src, dst, count)
      |         ^^^^^^^^^^^^^^^^^^^^^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics/mod.rs:4437:21
+    --> $CORE_SRC/intrinsics/mod.rs:4449:21
      |
-4437 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
+4449 | 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:4448:9
+    --> $CORE_SRC/intrinsics/mod.rs:4460:9
      |
-4448 | /         ub_checks::assert_unsafe_precondition!(
-4449 | |             check_language_ub,
-4450 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
+4460 | /         ub_checks::assert_unsafe_precondition!(
+4461 | |             check_language_ub,
+4462 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
 ...    |
-4458 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
-4459 | |         );
+4470 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
+4471 | |         );
      | |_________^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics/mod.rs:4448:9
+    --> $CORE_SRC/intrinsics/mod.rs:4460:9
      |
-4448 | /         ub_checks::assert_unsafe_precondition!(
-4449 | |             check_language_ub,
-4450 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
+4460 | /         ub_checks::assert_unsafe_precondition!(
+4461 | |             check_language_ub,
+4462 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
 ...    |
-4458 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
-4459 | |         );
+4470 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
+4471 | |         );
      | |_________^
 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 1385 8
+OpLine %8 1380 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 1385 8
+OpLine %8 1380 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 1587 8
+OpLine %11 1582 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 1587 8
+OpLine %11 1582 8
 OpStore %6 %9
 OpNoLine
 OpReturn