From 0892b3841a67ab21b4947fe06c32f2b9cae8d4e8 Mon Sep 17 00:00:00 2001 From: Andy Leiserson Date: Wed, 17 Jun 2026 01:02:56 -0700 Subject: [PATCH] fix(naga msl-out): Fix identifier collision for multiple fragment `return`s (#9684) --- naga/src/back/msl/writer.rs | 2 +- .../in/wgsl/msl-9683-multiple-returns.toml | 1 + .../in/wgsl/msl-9683-multiple-returns.wgsl | 9 +++++++++ naga/tests/out/msl/wgsl-fragment-output.metal | 4 ++-- naga/tests/out/msl/wgsl-interface.metal | 4 ++-- .../msl/wgsl-msl-9683-multiple-returns.metal | 20 +++++++++++++++++++ 6 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 naga/tests/in/wgsl/msl-9683-multiple-returns.toml create mode 100644 naga/tests/in/wgsl/msl-9683-multiple-returns.wgsl create mode 100644 naga/tests/out/msl/wgsl-msl-9683-multiple-returns.metal diff --git a/naga/src/back/msl/writer.rs b/naga/src/back/msl/writer.rs index df558d6ad..0a472f18e 100644 --- a/naga/src/back/msl/writer.rs +++ b/naga/src/back/msl/writer.rs @@ -3445,7 +3445,7 @@ impl Writer { let result_ty = context.function.result.as_ref().unwrap().ty; match context.module.types[result_ty].inner { crate::TypeInner::Struct { ref members, .. } => { - let tmp = "_tmp"; + let tmp = self.namer.call("_tmp"); write!(self.out, "{level}const auto {tmp} = ")?; self.put_expression(expr_handle, context, true)?; writeln!(self.out, ";")?; diff --git a/naga/tests/in/wgsl/msl-9683-multiple-returns.toml b/naga/tests/in/wgsl/msl-9683-multiple-returns.toml new file mode 100644 index 000000000..43b7c06c1 --- /dev/null +++ b/naga/tests/in/wgsl/msl-9683-multiple-returns.toml @@ -0,0 +1 @@ +targets = "METAL" diff --git a/naga/tests/in/wgsl/msl-9683-multiple-returns.wgsl b/naga/tests/in/wgsl/msl-9683-multiple-returns.wgsl new file mode 100644 index 000000000..1327e5069 --- /dev/null +++ b/naga/tests/in/wgsl/msl-9683-multiple-returns.wgsl @@ -0,0 +1,9 @@ +struct Outputs { + @location(0) color : vec4, +} + +@fragment +fn main() -> Outputs { + return Outputs(vec4f()); + return Outputs(vec4f()); +} diff --git a/naga/tests/out/msl/wgsl-fragment-output.metal b/naga/tests/out/msl/wgsl-fragment-output.metal index 0fe972f57..66e6355f2 100644 --- a/naga/tests/out/msl/wgsl-fragment-output.metal +++ b/naga/tests/out/msl/wgsl-fragment-output.metal @@ -63,6 +63,6 @@ fragment main_vec2scalarOutput main_vec2scalar( output_1.scalari = 0; output_1.scalaru = 0u; FragmentOutputVec2Scalar _e16 = output_1; - const auto _tmp = _e16; - return main_vec2scalarOutput { _tmp.vec2f, _tmp.vec2i, _tmp.vec2u, _tmp.scalarf, _tmp.scalari, _tmp.scalaru }; + const auto _tmp_1 = _e16; + return main_vec2scalarOutput { _tmp_1.vec2f, _tmp_1.vec2i, _tmp_1.vec2u, _tmp_1.scalarf, _tmp_1.scalari, _tmp_1.scalaru }; } diff --git a/naga/tests/out/msl/wgsl-interface.metal b/naga/tests/out/msl/wgsl-interface.metal index c4f63ca9a..df2306aad 100644 --- a/naga/tests/out/msl/wgsl-interface.metal +++ b/naga/tests/out/msl/wgsl-interface.metal @@ -62,8 +62,8 @@ fragment fragment_Output fragment_( const VertexOutput in = { position, varyings_1._varying }; uint mask = sample_mask & (1u << sample_index); float color_1 = front_facing ? 1.0 : 0.0; - const auto _tmp = FragmentOutput {in._varying, mask, color_1}; - return fragment_Output { _tmp.depth, _tmp.sample_mask, _tmp.color }; + const auto _tmp_1 = FragmentOutput {in._varying, mask, color_1}; + return fragment_Output { _tmp_1.depth, _tmp_1.sample_mask, _tmp_1.color }; } diff --git a/naga/tests/out/msl/wgsl-msl-9683-multiple-returns.metal b/naga/tests/out/msl/wgsl-msl-9683-multiple-returns.metal new file mode 100644 index 000000000..21d42ef0f --- /dev/null +++ b/naga/tests/out/msl/wgsl-msl-9683-multiple-returns.metal @@ -0,0 +1,20 @@ +// language: metal1.0 +#include +#include + +using metal::uint; + +struct Outputs { + metal::float4 color; +}; + +struct main_Output { + metal::float4 color [[color(0)]]; +}; +fragment main_Output main_( +) { + const auto _tmp = Outputs {metal::float4 {}}; + return main_Output { _tmp.color }; + const auto _tmp_1 = Outputs {metal::float4 {}}; + return main_Output { _tmp_1.color }; +}