Migrate more tests from Ignore() to phony-assignment

The `Ignore()` intrinsic is about to be deprecated, so don't use it for testing. Bug: tint:1213 Change-Id: I314ecaeb9a9c337c7b6980189054120a74807ebd Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/67066 Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: David Neto <dneto@google.com> Reviewed-by: James Price <jrprice@google.com>
2025-12-09 21:47:47 +00:00 · 2021-10-22 00:21:44 +00:00
parent cc7c4f309b
commit c2fa68e551
171 changed files with 520 additions and 839 deletions
--- a/test/var/initialization/function/array.wgsl
+++ b/test/var/initialization/function/array.wgsl
@@ -1,5 +1,5 @@
 [[stage(compute), workgroup_size(1)]]
 fn main() {
    var v : array<i32, 3>;
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/function/array.wgsl.expected.hlsl
+++ b/test/var/initialization/function/array.wgsl.expected.hlsl
@@ -1,6 +1,5 @@
 [numthreads(1, 1, 1)]
 void main() {
  int v[3] = (int[3])0;
-  v;
  return;
 }
--- a/test/var/initialization/function/array.wgsl.expected.msl
+++ b/test/var/initialization/function/array.wgsl.expected.msl
@@ -7,7 +7,6 @@ struct tint_array_wrapper {

 kernel void tint_symbol() {
  tint_array_wrapper v = {};
-  (void) v;
  return;
 }

--- a/test/var/initialization/function/array.wgsl.expected.spvasm
+++ b/test/var/initialization/function/array.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 13
+; Bound: 12
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
--- a/test/var/initialization/function/array.wgsl.expected.wgsl
+++ b/test/var/initialization/function/array.wgsl.expected.wgsl
@@ -1,5 +1,5 @@
 [[stage(compute), workgroup_size(1)]]
 fn main() {
  var v : array<i32, 3>;
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/function/matrix.wgsl
+++ b/test/var/initialization/function/matrix.wgsl
@@ -1,5 +1,5 @@
 [[stage(compute), workgroup_size(1)]]
 fn main() {
    var v : mat2x3<f32>;
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/function/matrix.wgsl.expected.hlsl
+++ b/test/var/initialization/function/matrix.wgsl.expected.hlsl
@@ -1,6 +1,5 @@
 [numthreads(1, 1, 1)]
 void main() {
  float2x3 v = float2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
-  v;
  return;
 }
--- a/test/var/initialization/function/matrix.wgsl.expected.msl
+++ b/test/var/initialization/function/matrix.wgsl.expected.msl
@@ -3,7 +3,6 @@
 using namespace metal;
 kernel void tint_symbol() {
  float2x3 v = float2x3(0.0f);
-  (void) v;
  return;
 }

--- a/test/var/initialization/function/matrix.wgsl.expected.spvasm
+++ b/test/var/initialization/function/matrix.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 12
+; Bound: 11
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
--- a/test/var/initialization/function/matrix.wgsl.expected.wgsl
+++ b/test/var/initialization/function/matrix.wgsl.expected.wgsl
@@ -1,5 +1,5 @@
 [[stage(compute), workgroup_size(1)]]
 fn main() {
  var v : mat2x3<f32>;
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/function/scalar.wgsl
+++ b/test/var/initialization/function/scalar.wgsl
@@ -1,5 +1,5 @@
 [[stage(compute), workgroup_size(1)]]
 fn main() {
    var v : i32;
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/function/scalar.wgsl.expected.hlsl
+++ b/test/var/initialization/function/scalar.wgsl.expected.hlsl
@@ -1,6 +1,5 @@
 [numthreads(1, 1, 1)]
 void main() {
  int v = 0;
-  v;
  return;
 }
--- a/test/var/initialization/function/scalar.wgsl.expected.msl
+++ b/test/var/initialization/function/scalar.wgsl.expected.msl
@@ -3,7 +3,6 @@
 using namespace metal;
 kernel void tint_symbol() {
  int v = 0;
-  (void) v;
  return;
 }

--- a/test/var/initialization/function/scalar.wgsl.expected.spvasm
+++ b/test/var/initialization/function/scalar.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 10
+; Bound: 9
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
--- a/test/var/initialization/function/scalar.wgsl.expected.wgsl
+++ b/test/var/initialization/function/scalar.wgsl.expected.wgsl
@@ -1,5 +1,5 @@
 [[stage(compute), workgroup_size(1)]]
 fn main() {
  var v : i32;
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/function/struct.wgsl
+++ b/test/var/initialization/function/struct.wgsl
@@ -6,5 +6,5 @@ struct S {
 [[stage(compute), workgroup_size(1)]]
 fn main() {
    var v : S;
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/function/struct.wgsl.expected.hlsl
+++ b/test/var/initialization/function/struct.wgsl.expected.hlsl
@@ -6,6 +6,5 @@ struct S {
 [numthreads(1, 1, 1)]
 void main() {
  S v = (S)0;
-  v;
  return;
 }
--- a/test/var/initialization/function/struct.wgsl.expected.msl
+++ b/test/var/initialization/function/struct.wgsl.expected.msl
@@ -8,7 +8,6 @@ struct S {

 kernel void tint_symbol() {
  S v = {};
-  (void) v;
  return;
 }

--- a/test/var/initialization/function/struct.wgsl.expected.spvasm
+++ b/test/var/initialization/function/struct.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 12
+; Bound: 11
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
--- a/test/var/initialization/function/struct.wgsl.expected.wgsl
+++ b/test/var/initialization/function/struct.wgsl.expected.wgsl
@@ -6,5 +6,5 @@ struct S {
 [[stage(compute), workgroup_size(1)]]
 fn main() {
  var v : S;
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/function/vector.wgsl
+++ b/test/var/initialization/function/vector.wgsl
@@ -1,5 +1,5 @@
 [[stage(compute), workgroup_size(1)]]
 fn main() {
    var v : vec3<i32>;
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/function/vector.wgsl.expected.hlsl
+++ b/test/var/initialization/function/vector.wgsl.expected.hlsl
@@ -1,6 +1,5 @@
 [numthreads(1, 1, 1)]
 void main() {
  int3 v = int3(0, 0, 0);
-  v;
  return;
 }
--- a/test/var/initialization/function/vector.wgsl.expected.msl
+++ b/test/var/initialization/function/vector.wgsl.expected.msl
@@ -3,7 +3,6 @@
 using namespace metal;
 kernel void tint_symbol() {
  int3 v = 0;
-  (void) v;
  return;
 }

--- a/test/var/initialization/function/vector.wgsl.expected.spvasm
+++ b/test/var/initialization/function/vector.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 11
+; Bound: 10
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
--- a/test/var/initialization/function/vector.wgsl.expected.wgsl
+++ b/test/var/initialization/function/vector.wgsl.expected.wgsl
@@ -1,5 +1,5 @@
 [[stage(compute), workgroup_size(1)]]
 fn main() {
  var v : vec3<i32>;
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/private/array.wgsl
+++ b/test/var/initialization/private/array.wgsl
@@ -2,5 +2,5 @@ var<private> v : array<i32, 3>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/private/array.wgsl.expected.hlsl
+++ b/test/var/initialization/private/array.wgsl.expected.hlsl
@@ -2,6 +2,5 @@ static int v[3] = (int[3])0;

 [numthreads(1, 1, 1)]
 void main() {
-  v;
  return;
 }
--- a/test/var/initialization/private/array.wgsl.expected.msl
+++ b/test/var/initialization/private/array.wgsl.expected.msl
@@ -7,7 +7,6 @@ struct tint_array_wrapper {

 kernel void tint_symbol() {
  thread tint_array_wrapper tint_symbol_1 = {};
-  (void) tint_symbol_1;
  return;
 }

--- a/test/var/initialization/private/array.wgsl.expected.spvasm
+++ b/test/var/initialization/private/array.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 13
+; Bound: 12
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
--- a/test/var/initialization/private/array.wgsl.expected.wgsl
+++ b/test/var/initialization/private/array.wgsl.expected.wgsl
@@ -2,5 +2,5 @@ var<private> v : array<i32, 3>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/private/matrix.wgsl
+++ b/test/var/initialization/private/matrix.wgsl
@@ -2,5 +2,5 @@ var<private> v : mat2x3<f32>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/private/matrix.wgsl.expected.hlsl
+++ b/test/var/initialization/private/matrix.wgsl.expected.hlsl
@@ -2,6 +2,5 @@ static float2x3 v = float2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);

 [numthreads(1, 1, 1)]
 void main() {
-  v;
  return;
 }
--- a/test/var/initialization/private/matrix.wgsl.expected.msl
+++ b/test/var/initialization/private/matrix.wgsl.expected.msl
@@ -3,7 +3,6 @@
 using namespace metal;
 kernel void tint_symbol() {
  thread float2x3 tint_symbol_1 = float2x3(0.0f);
-  (void) tint_symbol_1;
  return;
 }

--- a/test/var/initialization/private/matrix.wgsl.expected.spvasm
+++ b/test/var/initialization/private/matrix.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 12
+; Bound: 11
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
--- a/test/var/initialization/private/matrix.wgsl.expected.wgsl
+++ b/test/var/initialization/private/matrix.wgsl.expected.wgsl
@@ -2,5 +2,5 @@ var<private> v : mat2x3<f32>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/private/scalar.wgsl
+++ b/test/var/initialization/private/scalar.wgsl
@@ -2,5 +2,5 @@ var<private> v : i32;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/private/scalar.wgsl.expected.hlsl
+++ b/test/var/initialization/private/scalar.wgsl.expected.hlsl
@@ -2,6 +2,5 @@ static int v = 0;

 [numthreads(1, 1, 1)]
 void main() {
-  v;
  return;
 }
--- a/test/var/initialization/private/scalar.wgsl.expected.msl
+++ b/test/var/initialization/private/scalar.wgsl.expected.msl
@@ -3,7 +3,6 @@
 using namespace metal;
 kernel void tint_symbol() {
  thread int tint_symbol_1 = 0;
-  (void) tint_symbol_1;
  return;
 }

--- a/test/var/initialization/private/scalar.wgsl.expected.spvasm
+++ b/test/var/initialization/private/scalar.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 10
+; Bound: 9
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
--- a/test/var/initialization/private/scalar.wgsl.expected.wgsl
+++ b/test/var/initialization/private/scalar.wgsl.expected.wgsl
@@ -2,5 +2,5 @@ var<private> v : i32;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/private/struct.wgsl
+++ b/test/var/initialization/private/struct.wgsl
@@ -7,5 +7,5 @@ var<private> v : S;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/private/struct.wgsl.expected.hlsl
+++ b/test/var/initialization/private/struct.wgsl.expected.hlsl
@@ -7,6 +7,5 @@ static S v = (S)0;

 [numthreads(1, 1, 1)]
 void main() {
-  v;
  return;
 }
--- a/test/var/initialization/private/struct.wgsl.expected.msl
+++ b/test/var/initialization/private/struct.wgsl.expected.msl
@@ -8,7 +8,6 @@ struct S {

 kernel void tint_symbol() {
  thread S tint_symbol_1 = {};
-  (void) tint_symbol_1;
  return;
 }

--- a/test/var/initialization/private/struct.wgsl.expected.spvasm
+++ b/test/var/initialization/private/struct.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 12
+; Bound: 11
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
--- a/test/var/initialization/private/struct.wgsl.expected.wgsl
+++ b/test/var/initialization/private/struct.wgsl.expected.wgsl
@@ -7,5 +7,5 @@ var<private> v : S;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/private/vector.wgsl
+++ b/test/var/initialization/private/vector.wgsl
@@ -2,5 +2,5 @@ var<private> v : vec3<i32>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/private/vector.wgsl.expected.hlsl
+++ b/test/var/initialization/private/vector.wgsl.expected.hlsl
@@ -2,6 +2,5 @@ static int3 v = int3(0, 0, 0);

 [numthreads(1, 1, 1)]
 void main() {
-  v;
  return;
 }
--- a/test/var/initialization/private/vector.wgsl.expected.msl
+++ b/test/var/initialization/private/vector.wgsl.expected.msl
@@ -3,7 +3,6 @@
 using namespace metal;
 kernel void tint_symbol() {
  thread int3 tint_symbol_1 = 0;
-  (void) tint_symbol_1;
  return;
 }

--- a/test/var/initialization/private/vector.wgsl.expected.spvasm
+++ b/test/var/initialization/private/vector.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 11
+; Bound: 10
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
--- a/test/var/initialization/private/vector.wgsl.expected.wgsl
+++ b/test/var/initialization/private/vector.wgsl.expected.wgsl
@@ -2,5 +2,5 @@ var<private> v : vec3<i32>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/workgroup/array.wgsl
+++ b/test/var/initialization/workgroup/array.wgsl
@@ -2,5 +2,5 @@ var<workgroup> v : array<i32, 3>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/workgroup/array.wgsl.expected.hlsl
+++ b/test/var/initialization/workgroup/array.wgsl.expected.hlsl
@@ -12,7 +12,6 @@ void main_inner(uint local_invocation_index) {
    }
  }
  GroupMemoryBarrierWithGroupSync();
-  v;
 }

 [numthreads(1, 1, 1)]
--- a/test/var/initialization/workgroup/array.wgsl.expected.msl
+++ b/test/var/initialization/workgroup/array.wgsl.expected.msl
@@ -11,7 +11,6 @@ void tint_symbol_inner(uint local_invocation_index, threadgroup tint_array_wrapp
    (*(tint_symbol_1)).arr[i] = int();
  }
  threadgroup_barrier(mem_flags::mem_threadgroup);
-  (void) *(tint_symbol_1);
 }

 kernel void tint_symbol(uint local_invocation_index [[thread_index_in_threadgroup]]) {
--- a/test/var/initialization/workgroup/array.wgsl.expected.spvasm
+++ b/test/var/initialization/workgroup/array.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 43
+; Bound: 42
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
@@ -33,7 +33,7 @@
     %uint_1 = OpConstant %uint 1
     %uint_2 = OpConstant %uint 2
   %uint_264 = OpConstant %uint 264
-         %38 = OpTypeFunction %void
+         %37 = OpTypeFunction %void
 %main_inner = OpFunction %void None %9
 %local_invocation_index = OpFunctionParameter %uint
         %13 = OpLabel
@@ -65,9 +65,9 @@
               OpControlBarrier %uint_2 %uint_2 %uint_264
               OpReturn
               OpFunctionEnd
-       %main = OpFunction %void None %38
-         %40 = OpLabel
-         %42 = OpLoad %uint %local_invocation_index_1
-         %41 = OpFunctionCall %void %main_inner %42
+       %main = OpFunction %void None %37
+         %39 = OpLabel
+         %41 = OpLoad %uint %local_invocation_index_1
+         %40 = OpFunctionCall %void %main_inner %41
               OpReturn
               OpFunctionEnd
--- a/test/var/initialization/workgroup/array.wgsl.expected.wgsl
+++ b/test/var/initialization/workgroup/array.wgsl.expected.wgsl
@@ -2,5 +2,5 @@ var<workgroup> v : array<i32, 3>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/workgroup/matrix.wgsl
+++ b/test/var/initialization/workgroup/matrix.wgsl
@@ -2,5 +2,5 @@ var<workgroup> v : mat2x3<f32>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/workgroup/matrix.wgsl.expected.hlsl
+++ b/test/var/initialization/workgroup/matrix.wgsl.expected.hlsl
@@ -9,7 +9,6 @@ void main_inner(uint local_invocation_index) {
    v = float2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
  }
  GroupMemoryBarrierWithGroupSync();
-  v;
 }

 [numthreads(1, 1, 1)]
--- a/test/var/initialization/workgroup/matrix.wgsl.expected.msl
+++ b/test/var/initialization/workgroup/matrix.wgsl.expected.msl
@@ -10,7 +10,6 @@ void tint_symbol_inner(uint local_invocation_index, threadgroup float2x3* const
    *(tint_symbol_1) = float2x3();
  }
  threadgroup_barrier(mem_flags::mem_threadgroup);
-  (void) *(tint_symbol_1);
 }

 kernel void tint_symbol(threadgroup tint_symbol_4* tint_symbol_3 [[threadgroup(0)]], uint local_invocation_index [[thread_index_in_threadgroup]]) {
--- a/test/var/initialization/workgroup/matrix.wgsl.expected.spvasm
+++ b/test/var/initialization/workgroup/matrix.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 24
+; Bound: 23
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
@@ -26,7 +26,7 @@
         %14 = OpConstantNull %mat2v3float
     %uint_2 = OpConstant %uint 2
   %uint_264 = OpConstant %uint 264
-         %19 = OpTypeFunction %void
+         %18 = OpTypeFunction %void
 %main_inner = OpFunction %void None %9
 %local_invocation_index = OpFunctionParameter %uint
         %13 = OpLabel
@@ -34,9 +34,9 @@
               OpControlBarrier %uint_2 %uint_2 %uint_264
               OpReturn
               OpFunctionEnd
-       %main = OpFunction %void None %19
-         %21 = OpLabel
-         %23 = OpLoad %uint %local_invocation_index_1
-         %22 = OpFunctionCall %void %main_inner %23
+       %main = OpFunction %void None %18
+         %20 = OpLabel
+         %22 = OpLoad %uint %local_invocation_index_1
+         %21 = OpFunctionCall %void %main_inner %22
               OpReturn
               OpFunctionEnd
--- a/test/var/initialization/workgroup/matrix.wgsl.expected.wgsl
+++ b/test/var/initialization/workgroup/matrix.wgsl.expected.wgsl
@@ -2,5 +2,5 @@ var<workgroup> v : mat2x3<f32>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/workgroup/scalar.wgsl
+++ b/test/var/initialization/workgroup/scalar.wgsl
@@ -2,5 +2,5 @@ var<workgroup> v : i32;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/workgroup/scalar.wgsl.expected.hlsl
+++ b/test/var/initialization/workgroup/scalar.wgsl.expected.hlsl
@@ -9,7 +9,6 @@ void main_inner(uint local_invocation_index) {
    v = 0;
  }
  GroupMemoryBarrierWithGroupSync();
-  v;
 }

 [numthreads(1, 1, 1)]
--- a/test/var/initialization/workgroup/scalar.wgsl.expected.msl
+++ b/test/var/initialization/workgroup/scalar.wgsl.expected.msl
@@ -6,7 +6,6 @@ void tint_symbol_inner(uint local_invocation_index, threadgroup int* const tint_
    *(tint_symbol_1) = int();
  }
  threadgroup_barrier(mem_flags::mem_threadgroup);
-  (void) *(tint_symbol_1);
 }

 kernel void tint_symbol(uint local_invocation_index [[thread_index_in_threadgroup]]) {
--- a/test/var/initialization/workgroup/scalar.wgsl.expected.spvasm
+++ b/test/var/initialization/workgroup/scalar.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 22
+; Bound: 21
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
@@ -24,7 +24,7 @@
         %12 = OpConstantNull %int
     %uint_2 = OpConstant %uint 2
   %uint_264 = OpConstant %uint 264
-         %17 = OpTypeFunction %void
+         %16 = OpTypeFunction %void
 %main_inner = OpFunction %void None %7
 %local_invocation_index = OpFunctionParameter %uint
         %11 = OpLabel
@@ -32,9 +32,9 @@
               OpControlBarrier %uint_2 %uint_2 %uint_264
               OpReturn
               OpFunctionEnd
-       %main = OpFunction %void None %17
-         %19 = OpLabel
-         %21 = OpLoad %uint %local_invocation_index_1
-         %20 = OpFunctionCall %void %main_inner %21
+       %main = OpFunction %void None %16
+         %18 = OpLabel
+         %20 = OpLoad %uint %local_invocation_index_1
+         %19 = OpFunctionCall %void %main_inner %20
               OpReturn
               OpFunctionEnd
--- a/test/var/initialization/workgroup/scalar.wgsl.expected.wgsl
+++ b/test/var/initialization/workgroup/scalar.wgsl.expected.wgsl
@@ -2,5 +2,5 @@ var<workgroup> v : i32;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/workgroup/struct.wgsl
+++ b/test/var/initialization/workgroup/struct.wgsl
@@ -7,5 +7,5 @@ var<workgroup> v : S;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/workgroup/struct.wgsl.expected.hlsl
+++ b/test/var/initialization/workgroup/struct.wgsl.expected.hlsl
@@ -15,7 +15,6 @@ void main_inner(uint local_invocation_index) {
    v = tint_symbol_2;
  }
  GroupMemoryBarrierWithGroupSync();
-  v;
 }

 [numthreads(1, 1, 1)]
--- a/test/var/initialization/workgroup/struct.wgsl.expected.msl
+++ b/test/var/initialization/workgroup/struct.wgsl.expected.msl
@@ -12,7 +12,6 @@ void tint_symbol_inner(uint local_invocation_index, threadgroup S* const tint_sy
    *(tint_symbol_2) = tint_symbol_1;
  }
  threadgroup_barrier(mem_flags::mem_threadgroup);
-  (void) *(tint_symbol_2);
 }

 kernel void tint_symbol(uint local_invocation_index [[thread_index_in_threadgroup]]) {
--- a/test/var/initialization/workgroup/struct.wgsl.expected.spvasm
+++ b/test/var/initialization/workgroup/struct.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 24
+; Bound: 23
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
@@ -31,7 +31,7 @@
         %14 = OpConstantNull %S
     %uint_2 = OpConstant %uint 2
   %uint_264 = OpConstant %uint 264
-         %19 = OpTypeFunction %void
+         %18 = OpTypeFunction %void
 %main_inner = OpFunction %void None %9
 %local_invocation_index = OpFunctionParameter %uint
         %13 = OpLabel
@@ -39,9 +39,9 @@
               OpControlBarrier %uint_2 %uint_2 %uint_264
               OpReturn
               OpFunctionEnd
-       %main = OpFunction %void None %19
-         %21 = OpLabel
-         %23 = OpLoad %uint %local_invocation_index_1
-         %22 = OpFunctionCall %void %main_inner %23
+       %main = OpFunction %void None %18
+         %20 = OpLabel
+         %22 = OpLoad %uint %local_invocation_index_1
+         %21 = OpFunctionCall %void %main_inner %22
               OpReturn
               OpFunctionEnd
--- a/test/var/initialization/workgroup/struct.wgsl.expected.wgsl
+++ b/test/var/initialization/workgroup/struct.wgsl.expected.wgsl
@@ -7,5 +7,5 @@ var<workgroup> v : S;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(v);
+  _ = v;
 }
--- a/test/var/initialization/workgroup/vector.wgsl
+++ b/test/var/initialization/workgroup/vector.wgsl
@@ -2,5 +2,5 @@ var<workgroup> v : vec3<i32>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-    ignore(v);
+    _ = v;
 }
--- a/test/var/initialization/workgroup/vector.wgsl.expected.hlsl
+++ b/test/var/initialization/workgroup/vector.wgsl.expected.hlsl
@@ -9,7 +9,6 @@ void main_inner(uint local_invocation_index) {
    v = int3(0, 0, 0);
  }
  GroupMemoryBarrierWithGroupSync();
-  v;
 }

 [numthreads(1, 1, 1)]
--- a/test/var/initialization/workgroup/vector.wgsl.expected.msl
+++ b/test/var/initialization/workgroup/vector.wgsl.expected.msl
@@ -6,7 +6,6 @@ void tint_symbol_inner(uint local_invocation_index, threadgroup int3* const tint
    *(tint_symbol_1) = int3();
  }
  threadgroup_barrier(mem_flags::mem_threadgroup);
-  (void) *(tint_symbol_1);
 }

 kernel void tint_symbol(uint local_invocation_index [[thread_index_in_threadgroup]]) {
--- a/test/var/initialization/workgroup/vector.wgsl.expected.spvasm
+++ b/test/var/initialization/workgroup/vector.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 23
+; Bound: 22
 ; Schema: 0
               OpCapability Shader
               OpMemoryModel Logical GLSL450
@@ -25,7 +25,7 @@
         %13 = OpConstantNull %v3int
     %uint_2 = OpConstant %uint 2
   %uint_264 = OpConstant %uint 264
-         %18 = OpTypeFunction %void
+         %17 = OpTypeFunction %void
 %main_inner = OpFunction %void None %8
 %local_invocation_index = OpFunctionParameter %uint
         %12 = OpLabel
@@ -33,9 +33,9 @@
               OpControlBarrier %uint_2 %uint_2 %uint_264
               OpReturn
               OpFunctionEnd
-       %main = OpFunction %void None %18
-         %20 = OpLabel
-         %22 = OpLoad %uint %local_invocation_index_1
-         %21 = OpFunctionCall %void %main_inner %22
+       %main = OpFunction %void None %17
+         %19 = OpLabel
+         %21 = OpLoad %uint %local_invocation_index_1
+         %20 = OpFunctionCall %void %main_inner %21
               OpReturn
               OpFunctionEnd
--- a/test/var/initialization/workgroup/vector.wgsl.expected.wgsl
+++ b/test/var/initialization/workgroup/vector.wgsl.expected.wgsl
@@ -2,5 +2,5 @@ var<workgroup> v : vec3<i32>;

 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(v);
+  _ = v;
 }