rustup: update to nightly-2025-05-09 (~1.88).

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-04-28"
+channel = "nightly-2025-05-09"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = cb31a009e3e735ab08613cec2d8a5a754e65596f"#;
+# commit_hash = 50aa04180709189a03dde5fd1c05751b2625ed37"#;
 
 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/builder/intrinsics.rs

@@ -334,7 +334,7 @@ impl<'a, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'a, 'tcx> {
 
             _ => {
                 // Call the fallback body instead of generating the intrinsic code
-                return Err(ty::Instance::new(instance.def_id(), instance.args));
+                return Err(ty::Instance::new_raw(instance.def_id(), instance.args));
             }
         };
 

crates/rustc_codegen_spirv/src/codegen_cx/mod.rs

@@ -971,7 +971,7 @@ impl<'tcx> DebugInfoCodegenMethods<'tcx> for CodegenCx<'tcx> {
 
 impl<'tcx> AsmCodegenMethods<'tcx> for CodegenCx<'tcx> {
     fn codegen_global_asm(
-        &self,
+        &mut self,
         _template: &[InlineAsmTemplatePiece],
         _operands: &[GlobalAsmOperandRef<'tcx>],
         _options: InlineAsmOptions,

crates/rustc_codegen_spirv/src/lib.rs

@@ -12,6 +12,7 @@
 #![feature(string_from_utf8_lossy_owned)]
 #![feature(trait_alias)]
 #![feature(try_blocks)]
+#![recursion_limit = "256"]
 // HACK(eddyb) end of `rustc_codegen_ssa` crate-level attributes (see `build.rs`).
 
 //! Welcome to the API documentation for the `rust-gpu` project, this API is
@@ -150,7 +151,7 @@ use maybe_pqp_cg_ssa::traits::{
     CodegenBackend, ExtraBackendMethods, ModuleBufferMethods, ThinBufferMethods,
     WriteBackendMethods,
 };
-use maybe_pqp_cg_ssa::{CodegenResults, CompiledModule, ModuleCodegen, ModuleKind};
+use maybe_pqp_cg_ssa::{CodegenResults, CompiledModule, ModuleCodegen, ModuleKind, TargetConfig};
 use rspirv::binary::Assemble;
 use rustc_ast::expand::allocator::AllocatorKind;
 use rustc_ast::expand::autodiff_attrs::AutoDiffItem;
@@ -222,21 +223,33 @@ impl CodegenBackend for SpirvCodegenBackend {
         rustc_errors::DEFAULT_LOCALE_RESOURCE
     }
 
-    fn target_features_cfg(&self, sess: &Session) -> (Vec<Symbol>, Vec<Symbol>) {
+    fn target_config(&self, sess: &Session) -> TargetConfig {
         let cmdline = sess.opts.cg.target_feature.split(',');
         let cfg = sess.target.options.features.split(',');
 
-        let all_target_features: Vec<_> = cfg
+        let target_features: Vec<_> = cfg
             .chain(cmdline)
             .filter(|l| l.starts_with('+'))
             .map(|l| &l[1..])
             .filter(|l| !l.is_empty())
             .map(Symbol::intern)
             .collect();
 
-        // HACK(eddyb) the second list is "including unstable target features",
+        // HACK(eddyb) this should be a superset of `target_features`,
+        // which *additionally* also includes unstable target features,
         // but there is no reason to make a distinction for SPIR-V ones.
-        (all_target_features.clone(), all_target_features)
+        let unstable_target_features = target_features.clone();
+
+        TargetConfig {
+            target_features,
+            unstable_target_features,
+
+            // FIXME(eddyb) support and/or emulate `f16` and `f128`.
+            has_reliable_f16: false,
+            has_reliable_f16_math: false,
+            has_reliable_f128: false,
+            has_reliable_f128_math: false,
+        }
     }
 
     fn provide(&self, providers: &mut rustc_middle::util::Providers) {
@@ -438,8 +451,8 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
         // TODO: Do dep_graph stuff
         let cgu = tcx.codegen_unit(cgu_name);
 
-        let cx = CodegenCx::new(tcx, cgu);
-        let do_codegen = || {
+        let mut cx = CodegenCx::new(tcx, cgu);
+        let do_codegen = |cx: &mut CodegenCx<'_>| {
             let mono_items = cx.codegen_unit.items_in_deterministic_order(cx.tcx);
 
             if let Some(dir) = &cx.codegen_args.dump_mir {
@@ -448,27 +461,33 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
 
             for &(mono_item, mono_item_data) in mono_items.iter() {
                 mono_item.predefine::<Builder<'_, '_>>(
-                    &cx,
+                    cx,
                     mono_item_data.linkage,
                     mono_item_data.visibility,
                 );
             }
 
             // ... and now that we have everything pre-defined, fill out those definitions.
-            for &(mono_item, _) in mono_items.iter() {
-                mono_item.define::<Builder<'_, '_>>(&cx);
+            for &(mono_item, mono_item_data) in &mono_items {
+                mono_item.define::<Builder<'_, '_>>(cx, mono_item_data);
             }
 
-            if let Some(_entry) = maybe_create_entry_wrapper::<Builder<'_, '_>>(&cx) {
+            if let Some(_entry) = maybe_create_entry_wrapper::<Builder<'_, '_>>(cx) {
                 // attributes::sanitize(&cx, SanitizerSet::empty(), entry);
             }
         };
-        if let Some(path) = &cx.codegen_args.dump_module_on_panic {
-            let module_dumper = DumpModuleOnPanic { cx: &cx, path };
-            with_no_trimmed_paths!(do_codegen());
+        // HACK(eddyb) mutable access needed for `mono_item.define::<...>(cx, ...)`
+        // but that alone leads to needless cloning and smuggling a mutable borrow
+        // through `DumpModuleOnPanic` (for both its `Drop` impl and `do_codegen`).
+        if let Some(path) = cx.codegen_args.dump_module_on_panic.clone() {
+            let module_dumper = DumpModuleOnPanic {
+                cx: &mut cx,
+                path: &path,
+            };
+            with_no_trimmed_paths!(do_codegen(module_dumper.cx));
             drop(module_dumper);
         } else {
-            with_no_trimmed_paths!(do_codegen());
+            with_no_trimmed_paths!(do_codegen(&mut cx));
         }
         let spirv_module = cx.finalize_module().assemble();
 
@@ -495,7 +514,7 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
 }
 
 struct DumpModuleOnPanic<'a, 'cx, 'tcx> {
-    cx: &'cx CodegenCx<'tcx>,
+    cx: &'cx mut CodegenCx<'tcx>,
     path: &'a Path,
 }
 

examples/runners/wgpu/src/lib.rs

@@ -36,7 +36,6 @@
     clippy::map_err_ignore,
     clippy::map_flatten,
     clippy::map_unwrap_or,
-    clippy::match_on_vec_items,
     clippy::match_same_arms,
     clippy::match_wildcard_for_single_variants,
     clippy::mem_forget,

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2025-04-28"
+channel = "nightly-2025-05-09"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = cb31a009e3e735ab08613cec2d8a5a754e65596f
+# commit_hash = 50aa04180709189a03dde5fd1c05751b2625ed37
 
 # 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/arch/debug_printf_type_checking.stderr

@@ -75,9 +75,9 @@ help: the return type of this call is `u32` due to the type of the argument pass
     |                             |
     |                             this argument influences the return type of `debug_printf_assert_is_type`
 note: function defined here
-   --> $SPIRV_STD_SRC/lib.rs:134:8
+   --> $SPIRV_STD_SRC/lib.rs:133:8
     |
-134 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
+133 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
     = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: change the type of the numeric literal from `u32` to `f32`
@@ -103,9 +103,9 @@ help: the return type of this call is `f32` due to the type of the argument pass
     |                             |
     |                             this argument influences the return type of `debug_printf_assert_is_type`
 note: function defined here
-   --> $SPIRV_STD_SRC/lib.rs:134:8
+   --> $SPIRV_STD_SRC/lib.rs:133:8
     |
-134 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
+133 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
     = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: change the type of the numeric literal from `f32` to `u32`
@@ -131,12 +131,12 @@ error[E0277]: the trait bound `{float}: Vector<f32, 2>` is not satisfied
               `UVec3` implements `Vector<u32, 3>`
             and 5 others
 note: required by a bound in `debug_printf_assert_is_vector`
-   --> $SPIRV_STD_SRC/lib.rs:141:8
+   --> $SPIRV_STD_SRC/lib.rs:140:8
     |
-139 | pub fn debug_printf_assert_is_vector<
+138 | pub fn debug_printf_assert_is_vector<
     |        ----------------------------- required by a bound in this function
-140 |     TY: crate::scalar::Scalar,
-141 |     V: crate::vector::Vector<TY, SIZE>,
+139 |     TY: crate::scalar::Scalar,
+140 |     V: crate::vector::Vector<TY, SIZE>,
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `debug_printf_assert_is_vector`
     = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -157,9 +157,9 @@ help: the return type of this call is `Vec2` due to the type of the argument pas
     |                             |
     |                             this argument influences the return type of `debug_printf_assert_is_type`
 note: function defined here
-   --> $SPIRV_STD_SRC/lib.rs:134:8
+   --> $SPIRV_STD_SRC/lib.rs:133:8
     |
-134 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
+133 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
     = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 

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

@@ -1,13 +1,13 @@
 error: cannot memcpy dynamically sized data
-    --> $CORE_SRC/intrinsics/mod.rs:3851:9
+    --> $CORE_SRC/intrinsics/mod.rs:3850:9
      |
-3851 |         copy(src, dst, count)
+3850 |         copy(src, dst, count)
      |         ^^^^^^^^^^^^^^^^^^^^^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics/mod.rs:3831:21
+    --> $CORE_SRC/intrinsics/mod.rs:3830:21
      |
-3831 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
+3830 | 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:3839:9
+    --> $CORE_SRC/intrinsics/mod.rs:3838:9
      |
-3839 | /         ub_checks::assert_unsafe_precondition!(
-3840 | |             check_language_ub,
-3841 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
+3838 | /         ub_checks::assert_unsafe_precondition!(
+3839 | |             check_language_ub,
+3840 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
 ...    |
-3849 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
-3850 | |         );
+3848 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
+3849 | |         );
      | |_________^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics/mod.rs:3839:9
+    --> $CORE_SRC/intrinsics/mod.rs:3838:9
      |
-3839 | /         ub_checks::assert_unsafe_precondition!(
-3840 | |             check_language_ub,
-3841 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
+3838 | /         ub_checks::assert_unsafe_precondition!(
+3839 | |             check_language_ub,
+3840 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
 ...    |
-3849 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
-3850 | |         );
+3848 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
+3849 | |         );
      | |_________^
 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 1420 8
+OpLine %8 1455 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 1420 8
+OpLine %8 1455 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 1620 8
+OpLine %11 1655 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 1620 8
+OpLine %11 1655 8
 OpStore %6 %9
 OpNoLine
 OpReturn