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

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-09"
+channel = "nightly-2025-01-12"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = a580b5c379b4fca50dfe5afc0fc0ce00921e4e00"#;
+# commit_hash = eb54a50837ad4bcc9842924f27e7287ca66e294c"#;
 
 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/abi.rs

@@ -110,6 +110,7 @@ pub(crate) fn provide(providers: &mut Providers) {
             size,
             max_repr_align,
             unadjusted_abi_align,
+            randomization_seed,
         } = *layout;
         LayoutData {
             fields: match *fields {
@@ -156,6 +157,7 @@ pub(crate) fn provide(providers: &mut Providers) {
             size,
             max_repr_align,
             unadjusted_abi_align,
+            randomization_seed,
         }
     }
 

crates/rustc_codegen_spirv/src/codegen_cx/declare.rs

@@ -25,7 +25,9 @@ fn attrs_to_spirv(attrs: &CodegenFnAttrs) -> FunctionControl {
     let mut control = FunctionControl::NONE;
     match attrs.inline {
         InlineAttr::None => (),
-        InlineAttr::Hint | InlineAttr::Always => control.insert(FunctionControl::INLINE),
+        InlineAttr::Hint | InlineAttr::Always | InlineAttr::Force { .. } => {
+            control.insert(FunctionControl::INLINE)
+        }
         InlineAttr::Never => control.insert(FunctionControl::DONT_INLINE),
     }
     if attrs.flags.contains(CodegenFnAttrFlags::FFI_PURE) {

crates/rustc_codegen_spirv/src/linker/param_weakening.rs

@@ -8,7 +8,7 @@ use indexmap::IndexMap;
 use rspirv::dr::{Builder, Module, Operand};
 use rspirv::spirv::{Op, Word};
 use rustc_data_structures::fx::FxHashMap;
-use rustc_index::bit_set::BitSet;
+use rustc_index::bit_set::DenseBitSet as BitSet;
 use std::mem;
 
 pub fn remove_unused_params(module: Module) -> Module {

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2025-01-09"
+channel = "nightly-2025-01-12"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = a580b5c379b4fca50dfe5afc0fc0ce00921e4e00
+# commit_hash = eb54a50837ad4bcc9842924f27e7287ca66e294c
 
 # 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 1094 4
+OpLine %11 1098 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:4488:9
+    --> $CORE_SRC/intrinsics/mod.rs:4460:9
      |
-4488 |         copy(src, dst, count)
+4460 |         copy(src, dst, count)
      |         ^^^^^^^^^^^^^^^^^^^^^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics/mod.rs:4465:21
+    --> $CORE_SRC/intrinsics/mod.rs:4437:21
      |
-4465 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
+4437 | 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:4476:9
+    --> $CORE_SRC/intrinsics/mod.rs:4448:9
      |
-4476 | /         ub_checks::assert_unsafe_precondition!(
-4477 | |             check_language_ub,
-4478 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
+4448 | /         ub_checks::assert_unsafe_precondition!(
+4449 | |             check_language_ub,
+4450 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
 ...    |
-4486 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
-4487 | |         );
+4458 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
+4459 | |         );
      | |_________^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics/mod.rs:4476:9
+    --> $CORE_SRC/intrinsics/mod.rs:4448:9
      |
-4476 | /         ub_checks::assert_unsafe_precondition!(
-4477 | |             check_language_ub,
-4478 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
+4448 | /         ub_checks::assert_unsafe_precondition!(
+4449 | |             check_language_ub,
+4450 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
 ...    |
-4486 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
-4487 | |         );
+4458 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
+4459 | |         );
      | |_________^
 note: called by `ptr_copy::copy_via_raw_ptr`
     --> $DIR/ptr_copy.rs:28:18