Skip to content

Commit 45c42ca

Browse files
eddybeddyb
committed
rustup: update to nightly-2025-05-09 (~1.88).
1 parent 4bd5f2d commit 45c42ca

File tree

12 files changed

+71
-53
lines changed

12 files changed

+71
-53
lines changed

‎crates/rustc_codegen_spirv/build.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ use std::{env, fs, mem};
1818
/// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
1919
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");
2020
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
21-
channel = "nightly-2025-04-28"
21+
channel = "nightly-2025-05-09"
2222
components = ["rust-src", "rustc-dev", "llvm-tools"]
23-
# commit_hash = cb31a009e3e735ab08613cec2d8a5a754e65596f"#;
23+
# commit_hash = 50aa04180709189a03dde5fd1c05751b2625ed37"#;
2424

2525
fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
2626
let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());

‎crates/rustc_codegen_spirv/src/builder/intrinsics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ impl<'a, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'a, 'tcx> {
334334

335335
_ => {
336336
// Call the fallback body instead of generating the intrinsic code
337-
return Err(ty::Instance::new(instance.def_id(), instance.args));
337+
return Err(ty::Instance::new_raw(instance.def_id(), instance.args));
338338
}
339339
};
340340

‎crates/rustc_codegen_spirv/src/codegen_cx/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ impl<'tcx> DebugInfoCodegenMethods<'tcx> for CodegenCx<'tcx> {
966966

967967
impl<'tcx> AsmCodegenMethods<'tcx> for CodegenCx<'tcx> {
968968
fn codegen_global_asm(
969-
&self,
969+
&mut self,
970970
_template: &[InlineAsmTemplatePiece],
971971
_operands: &[GlobalAsmOperandRef<'tcx>],
972972
_options: InlineAsmOptions,

‎crates/rustc_codegen_spirv/src/lib.rs

+35-16
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#![feature(string_from_utf8_lossy_owned)]
1313
#![feature(trait_alias)]
1414
#![feature(try_blocks)]
15+
#![recursion_limit = "256"]
1516
// HACK(eddyb) end of `rustc_codegen_ssa` crate-level attributes (see `build.rs`).
1617

1718
//! Welcome to the API documentation for the `rust-gpu` project, this API is
@@ -150,7 +151,7 @@ use maybe_pqp_cg_ssa::traits::{
150151
CodegenBackend, ExtraBackendMethods, ModuleBufferMethods, ThinBufferMethods,
151152
WriteBackendMethods,
152153
};
153-
use maybe_pqp_cg_ssa::{CodegenResults, CompiledModule, ModuleCodegen, ModuleKind};
154+
use maybe_pqp_cg_ssa::{CodegenResults, CompiledModule, ModuleCodegen, ModuleKind, TargetConfig};
154155
use rspirv::binary::Assemble;
155156
use rustc_ast::expand::allocator::AllocatorKind;
156157
use rustc_ast::expand::autodiff_attrs::AutoDiffItem;
@@ -261,21 +262,33 @@ impl CodegenBackend for SpirvCodegenBackend {
261262
rustc_errors::DEFAULT_LOCALE_RESOURCE
262263
}
263264

264-
fn target_features_cfg(&self, sess: &Session) -> (Vec<Symbol>, Vec<Symbol>) {
265+
fn target_config(&self, sess: &Session) -> TargetConfig {
265266
let cmdline = sess.opts.cg.target_feature.split(',');
266267
let cfg = sess.target.options.features.split(',');
267268

268-
let all_target_features: Vec<_> = cfg
269+
let target_features: Vec<_> = cfg
269270
.chain(cmdline)
270271
.filter(|l| l.starts_with('+'))
271272
.map(|l| &l[1..])
272273
.filter(|l| !l.is_empty())
273274
.map(Symbol::intern)
274275
.collect();
275276

276-
// HACK(eddyb) the second list is "including unstable target features",
277+
// HACK(eddyb) this should be a superset of `target_features`,
278+
// which *additionally* also includes unstable target features,
277279
// but there is no reason to make a distinction for SPIR-V ones.
278-
(all_target_features.clone(), all_target_features)
280+
let unstable_target_features = target_features.clone();
281+
282+
TargetConfig {
283+
target_features,
284+
unstable_target_features,
285+
286+
// FIXME(eddyb) support and/or emulate `f16` and `f128`.
287+
has_reliable_f16: false,
288+
has_reliable_f16_math: false,
289+
has_reliable_f128: false,
290+
has_reliable_f128_math: false,
291+
}
279292
}
280293

281294
fn provide(&self, providers: &mut rustc_middle::util::Providers) {
@@ -477,8 +490,8 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
477490
// TODO: Do dep_graph stuff
478491
let cgu = tcx.codegen_unit(cgu_name);
479492

480-
let cx = CodegenCx::new(tcx, cgu);
481-
let do_codegen = || {
493+
let mut cx = CodegenCx::new(tcx, cgu);
494+
let do_codegen = |cx: &mut CodegenCx<'_>| {
482495
let mono_items = cx.codegen_unit.items_in_deterministic_order(cx.tcx);
483496

484497
if let Some(dir) = &cx.codegen_args.dump_mir {
@@ -492,32 +505,38 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
492505
}
493506
}
494507
mono_item.predefine::<Builder<'_, '_>>(
495-
&cx,
508+
cx,
496509
mono_item_data.linkage,
497510
mono_item_data.visibility,
498511
);
499512
}
500513

501514
// ... and now that we have everything pre-defined, fill out those definitions.
502-
for &(mono_item, _) in mono_items.iter() {
515+
for &(mono_item, mono_item_data) in &mono_items {
503516
if let MonoItem::Fn(instance) = mono_item {
504517
if is_blocklisted_fn(cx.tcx, &cx.sym, instance) {
505518
continue;
506519
}
507520
}
508-
mono_item.define::<Builder<'_, '_>>(&cx);
521+
mono_item.define::<Builder<'_, '_>>(cx, mono_item_data);
509522
}
510523

511-
if let Some(_entry) = maybe_create_entry_wrapper::<Builder<'_, '_>>(&cx) {
524+
if let Some(_entry) = maybe_create_entry_wrapper::<Builder<'_, '_>>(cx) {
512525
// attributes::sanitize(&cx, SanitizerSet::empty(), entry);
513526
}
514527
};
515-
if let Some(path) = &cx.codegen_args.dump_module_on_panic {
516-
let module_dumper = DumpModuleOnPanic { cx: &cx, path };
517-
with_no_trimmed_paths!(do_codegen());
528+
// HACK(eddyb) mutable access needed for `mono_item.define::<...>(cx, ...)`
529+
// but that alone leads to needless cloning and smuggling a mutable borrow
530+
// through `DumpModuleOnPanic` (for both its `Drop` impl and `do_codegen`).
531+
if let Some(path) = cx.codegen_args.dump_module_on_panic.clone() {
532+
let module_dumper = DumpModuleOnPanic {
533+
cx: &mut cx,
534+
path: &path,
535+
};
536+
with_no_trimmed_paths!(do_codegen(module_dumper.cx));
518537
drop(module_dumper);
519538
} else {
520-
with_no_trimmed_paths!(do_codegen());
539+
with_no_trimmed_paths!(do_codegen(&mut cx));
521540
}
522541
let spirv_module = cx.finalize_module().assemble();
523542

@@ -544,7 +563,7 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
544563
}
545564

546565
struct DumpModuleOnPanic<'a, 'cx, 'tcx> {
547-
cx: &'cx CodegenCx<'tcx>,
566+
cx: &'cx mut CodegenCx<'tcx>,
548567
path: &'a Path,
549568
}
550569

‎examples/runners/wgpu/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
clippy::map_err_ignore,
3737
clippy::map_flatten,
3838
clippy::map_unwrap_or,
39-
clippy::match_on_vec_items,
4039
clippy::match_same_arms,
4140
clippy::match_wildcard_for_single_variants,
4241
clippy::mem_forget,

‎rust-toolchain.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[toolchain]
2-
channel = "nightly-2025-04-28"
2+
channel = "nightly-2025-05-09"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]
4-
# commit_hash = cb31a009e3e735ab08613cec2d8a5a754e65596f
4+
# commit_hash = 50aa04180709189a03dde5fd1c05751b2625ed37
55

66
# Whenever changing the nightly channel, update the commit hash above, and make
77
# sure to change `REQUIRED_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` also.

‎tests/ui/arch/debug_printf_type_checking.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ help: the return type of this call is `u32` due to the type of the argument pass
7575
| |
7676
| this argument influences the return type of `debug_printf_assert_is_type`
7777
note: function defined here
78-
--> $SPIRV_STD_SRC/lib.rs:134:8
78+
--> $SPIRV_STD_SRC/lib.rs:133:8
7979
|
80-
134 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
80+
133 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
8181
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
8282
= note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
8383
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
103103
| |
104104
| this argument influences the return type of `debug_printf_assert_is_type`
105105
note: function defined here
106-
--> $SPIRV_STD_SRC/lib.rs:134:8
106+
--> $SPIRV_STD_SRC/lib.rs:133:8
107107
|
108-
134 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
108+
133 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
109109
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
110110
= note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
111111
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
131131
`UVec3` implements `Vector<u32, 3>`
132132
and 5 others
133133
note: required by a bound in `debug_printf_assert_is_vector`
134-
--> $SPIRV_STD_SRC/lib.rs:141:8
134+
--> $SPIRV_STD_SRC/lib.rs:140:8
135135
|
136-
139 | pub fn debug_printf_assert_is_vector<
136+
138 | pub fn debug_printf_assert_is_vector<
137137
| ----------------------------- required by a bound in this function
138-
140 | TY: crate::scalar::Scalar,
139-
141 | V: crate::vector::Vector<TY, SIZE>,
138+
139 | TY: crate::scalar::Scalar,
139+
140 | V: crate::vector::Vector<TY, SIZE>,
140140
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `debug_printf_assert_is_vector`
141141
= note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
142142

@@ -157,9 +157,9 @@ help: the return type of this call is `Vec2` due to the type of the argument pas
157157
| |
158158
| this argument influences the return type of `debug_printf_assert_is_type`
159159
note: function defined here
160-
--> $SPIRV_STD_SRC/lib.rs:134:8
160+
--> $SPIRV_STD_SRC/lib.rs:133:8
161161
|
162-
134 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
162+
133 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
163163
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
164164
= note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
165165

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: cannot memcpy dynamically sized data
2-
--> $CORE_SRC/intrinsics/mod.rs:3851:9
2+
--> $CORE_SRC/intrinsics/mod.rs:3850:9
33
|
4-
3851 | copy(src, dst, count)
4+
3850 | copy(src, dst, count)
55
| ^^^^^^^^^^^^^^^^^^^^^
66
|
77
note: used from within `core::intrinsics::copy::<f32>`
8-
--> $CORE_SRC/intrinsics/mod.rs:3831:21
8+
--> $CORE_SRC/intrinsics/mod.rs:3830:21
99
|
10-
3831 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
10+
3830 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
1111
| ^^^^
1212
note: called by `ptr_copy::copy_via_raw_ptr`
1313
--> $DIR/ptr_copy.rs:28:18
@@ -28,25 +28,25 @@ note: called by `main`
2828
error: cannot cast between pointer types
2929
from `*f32`
3030
to `*struct () { }`
31-
--> $CORE_SRC/intrinsics/mod.rs:3839:9
31+
--> $CORE_SRC/intrinsics/mod.rs:3838:9
3232
|
33-
3839 | / ub_checks::assert_unsafe_precondition!(
34-
3840 | | check_language_ub,
35-
3841 | | "ptr::copy requires that both pointer arguments are aligned and non-null",
33+
3838 | / ub_checks::assert_unsafe_precondition!(
34+
3839 | | check_language_ub,
35+
3840 | | "ptr::copy requires that both pointer arguments are aligned and non-null",
3636
... |
37-
3849 | | && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
38-
3850 | | );
37+
3848 | | && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
38+
3849 | | );
3939
| |_________^
4040
|
4141
note: used from within `core::intrinsics::copy::<f32>`
42-
--> $CORE_SRC/intrinsics/mod.rs:3839:9
42+
--> $CORE_SRC/intrinsics/mod.rs:3838:9
4343
|
44-
3839 | / ub_checks::assert_unsafe_precondition!(
45-
3840 | | check_language_ub,
46-
3841 | | "ptr::copy requires that both pointer arguments are aligned and non-null",
44+
3838 | / ub_checks::assert_unsafe_precondition!(
45+
3839 | | check_language_ub,
46+
3840 | | "ptr::copy requires that both pointer arguments are aligned and non-null",
4747
... |
48-
3849 | | && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
49-
3850 | | );
48+
3848 | | && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
49+
3849 | | );
5050
| |_________^
5151
note: called by `ptr_copy::copy_via_raw_ptr`
5252
--> $DIR/ptr_copy.rs:28:18

‎tests/ui/dis/ptr_read.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%4 = OpFunctionParameter %5
33
%6 = OpFunctionParameter %5
44
%7 = OpLabel
5-
OpLine %8 1420 8
5+
OpLine %8 1455 8
66
%9 = OpLoad %10 %4
77
OpLine %11 7 13
88
OpStore %6 %9

‎tests/ui/dis/ptr_read_method.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%4 = OpFunctionParameter %5
33
%6 = OpFunctionParameter %5
44
%7 = OpLabel
5-
OpLine %8 1420 8
5+
OpLine %8 1455 8
66
%9 = OpLoad %10 %4
77
OpLine %11 7 13
88
OpStore %6 %9

‎tests/ui/dis/ptr_write.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%7 = OpLabel
55
OpLine %8 7 35
66
%9 = OpLoad %10 %4
7-
OpLine %11 1620 8
7+
OpLine %11 1655 8
88
OpStore %6 %9
99
OpNoLine
1010
OpReturn

‎tests/ui/dis/ptr_write_method.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%7 = OpLabel
55
OpLine %8 7 37
66
%9 = OpLoad %10 %4
7-
OpLine %11 1620 8
7+
OpLine %11 1655 8
88
OpStore %6 %9
99
OpNoLine
1010
OpReturn

0 commit comments

Comments
 (0)