test: Regenerate vk-gl-cts WGSL sources

This removes @stride, which will soon be invalid.

Bug: tint:1381
Change-Id: I3cbe987edb9b918b2f344b92a4f0fe4838df4a80
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/83962
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

test/tint/vk-gl-cts/api/descriptor_set/descriptor_set_layout_binding/layout_binding_order/0.wgsl

@@ -2,19 +2,19 @@ struct result {
   res0 : i32;
   res1 : i32;
   res2 : i32;
-};
+}
 
 struct block0 {
   data0 : i32;
-};
+}
 
 struct block1 {
   data1 : i32;
-};
+}
 
 struct block2 {
   data2 : i32;
-};
+}
 
 @group(0) @binding(3) var<storage, read_write> x_4 : result;
 

test/tint/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.wgsl

@@ -1,6 +1,6 @@
 struct block0 {
   data : vec4<f32>;
-};
+}
 
 @group(0) @binding(1) var<storage, read_write> x_4 : block0;
 

test/tint/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.wgsl

@@ -1,6 +1,6 @@
 struct block0 {
   in_color : vec4<f32>;
-};
+}
 
 var<private> position : vec4<f32>;
 
@@ -23,7 +23,7 @@ struct main_out {
   gl_Position : vec4<f32>;
   @location(0)
   frag_color_1 : vec4<f32>;
-};
+}
 
 @stage(vertex)
 fn main(@location(0) position_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/1.wgsl

@@ -11,7 +11,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   final_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@location(0) frag_color_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/combined_operations/negintdivand/0-opt.wgsl

@@ -17,7 +17,7 @@ struct main_out {
   gl_Position : vec4<f32>;
   @location(1)
   frag_color_1 : vec4<f32>;
-};
+}
 
 @stage(vertex)
 fn main(@location(0) position_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/combined_operations/negintdivand/1.wgsl

@@ -18,7 +18,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   color_out_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@location(1) frag_color_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/access-new-vector-inside-if-condition/0-opt.wgsl

@@ -13,7 +13,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.wgsl

@@ -1,17 +1,17 @@
 struct tmp_struct {
-  nmb : array<i32, 1>;
+  nmb : array<i32, 1u>;
-};
+}
 
 struct buf0 {
   injectionSwitch : vec2<f32>;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_11 : buf0;
 
 var<private> x_GLF_color : vec4<f32>;
 
 fn main_1() {
-  var x_24 : array<i32, 1>;
+  var x_24 : array<i32, 1u>;
   var x_68 : bool = false;
   var x_17 : i32;
   var x_18 : i32;
@@ -29,7 +29,7 @@ fn main_1() {
     tmp_float = x_75;
     let x_76 : vec3<f32> = vec3<f32>(x_75, x_75, x_75);
     color = x_76;
-    x_24 = tmp_struct(array<i32, 1>(0)).nmb;
+    x_24 = tmp_struct(array<i32, 1u>()).nmb;
     x_68 = false;
     x_79_phi = false;
     loop {
@@ -103,7 +103,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.wgsl

@@ -1,10 +1,10 @@
 struct QuicksortObject {
-  numbers : array<i32, 10>;
+  numbers : array<i32, 10u>;
-};
+}
 
 struct buf0 {
   resolution : vec2<f32>;
-};
+}
 
 var<private> obj : QuicksortObject;
 
@@ -80,7 +80,7 @@ fn quicksort_() {
   var l_1 : i32;
   var h_1 : i32;
   var top : i32;
-  var stack : array<i32, 10>;
+  var stack : array<i32, 10u>;
   var p : i32;
   var param_4 : i32;
   var param_5 : i32;
@@ -187,7 +187,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   injectionSwitch : vec2<f32>;
-};
+}
 
 var<private> gl_FragCoord : vec4<f32>;
 
@@ -31,7 +31,7 @@ fn func_() -> f32 {
 fn main_1() {
   var i : i32;
   var j : i32;
-  var data : array<vec2<f32>, 17>;
+  var data : array<vec2<f32>, 17u>;
   i = 0;
   loop {
     let x_48 : i32 = i;
@@ -93,7 +93,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/assign-array-value-to-another-array-2/0-opt.wgsl

@@ -1,8 +1,8 @@
-var<private> data : array<i32, 9>;
+var<private> data : array<i32, 9u>;
 
 var<private> gl_FragCoord : vec4<f32>;
 
-var<private> temp : array<i32, 7>;
+var<private> temp : array<i32, 7u>;
 
 var<private> x_GLF_color : vec4<f32>;
 
@@ -67,7 +67,6 @@ fn func_i1_(a : ptr<function, i32>) -> f32 {
   } else {
     return 0.0;
   }
-  return 0.0;
 }
 
 fn main_1() {
@@ -104,7 +103,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/assign-array-value-to-another-array/0-opt.wgsl

@@ -2,8 +2,8 @@ var<private> x_GLF_color : vec4<f32>;
 
 fn func_i1_(x : ptr<function, i32>) {
   var a : i32;
-  var data : array<i32, 9>;
+  var data : array<i32, 9u>;
-  var temp : array<i32, 2>;
+  var temp : array<i32, 2u>;
   var i : i32;
   var x_95 : bool;
   var x_96_phi : bool;
@@ -85,7 +85,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl

@@ -1,53 +0,0 @@
-#version 310 es
-
-struct buf1 {
-  vec2 injectionSwitch;
-};
-
-uvec3 tint_symbol = uvec3(0u, 0u, 0u);
-layout(binding = 0, std430) buffer doesNotMatter_1 {
-  int global_seed;
-  int data[];
-} x_7;
-layout(binding = 1) uniform buf1_1 {
-  vec2 injectionSwitch;
-} x_10;
-
-void main_1() {
-  int lid = 0;
-  int val = 0;
-  int i = 0;
-  uint x_40 = tint_symbol.x;
-  lid = int(x_40);
-  int x_43 = x_7.global_seed;
-  val = x_43;
-  i = 0;
-  {
-    for(; (i < 2); i = (i + 1)) {
-      if ((lid > 0)) {
-        int x_58 = x_7.data[(lid - 1)];
-        val = (val + x_58);
-        float x_62 = x_10.injectionSwitch.x;
-        if ((x_62 > 100.0f)) {
-          break;
-        }
-      }
-      barrier();
-    }
-  }
-  if ((lid == 0)) {
-    x_7.data[0] = 42;
-  }
-  return;
-}
-
-void tint_symbol_1(uvec3 tint_symbol_2) {
-  tint_symbol = tint_symbol_2;
-  main_1();
-}
-
-layout(local_size_x = 16, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  tint_symbol_1(gl_LocalInvocationID);
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl

@@ -1,13 +1,13 @@
-type RTArr = @stride(4) array<i32>;
+type RTArr = array<i32>;
 
 struct doesNotMatter {
   global_seed : i32;
   data : RTArr;
-};
+}
 
 struct buf1 {
   injectionSwitch : vec2<f32>;
-};
+}
 
 var<private> gl_LocalInvocationID : vec3<u32>;
 

test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl

@@ -1,57 +0,0 @@
-vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type RTArr = @stride(4) array<i32>;
-              ^^^^^^
-
-#version 310 es
-
-struct buf1 {
-  vec2 injectionSwitch;
-};
-
-uvec3 tint_symbol = uvec3(0u, 0u, 0u);
-layout(binding = 0, std430) buffer doesNotMatter_1 {
-  int global_seed;
-  int data[];
-} x_7;
-layout(binding = 1) uniform buf1_1 {
-  vec2 injectionSwitch;
-} x_10;
-
-void main_1() {
-  int lid = 0;
-  int val = 0;
-  int i = 0;
-  uint x_40 = tint_symbol.x;
-  lid = int(x_40);
-  int x_43 = x_7.global_seed;
-  val = x_43;
-  i = 0;
-  {
-    for(; (i < 2); i = (i + 1)) {
-      if ((lid > 0)) {
-        int x_58 = x_7.data[(lid - 1)];
-        val = (val + x_58);
-        float x_62 = x_10.injectionSwitch.x;
-        if ((x_62 > 100.0f)) {
-          break;
-        }
-      }
-      barrier();
-    }
-  }
-  if ((lid == 0)) {
-    x_7.data[0] = 42;
-  }
-  return;
-}
-
-void tint_symbol_1(uvec3 tint_symbol_2) {
-  tint_symbol = tint_symbol_2;
-  main_1();
-}
-
-layout(local_size_x = 16, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  tint_symbol_1(gl_LocalInvocationID);
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   injectionSwitch : vec2<f32>;
-};
+}
 
 var<private> x_GLF_color : vec4<f32>;
 
@@ -19,7 +19,6 @@ fn main_1() {
       } else {
         continue;
       }
-      continue;
     }
     break;
 
@@ -36,7 +35,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/call-function-with-discard/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   one : f32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -30,7 +30,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.wgsl

@@ -1,13 +1,13 @@
 struct buf0 {
   injectionSwitch : vec2<f32>;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
 var<private> x_GLF_color : vec4<f32>;
 
 fn main_1() {
-  var data : array<i32, 10>;
+  var data : array<i32, 10u>;
   var x_40 : i32;
   var x_40_phi : i32;
   var x_11_phi : i32;
@@ -48,7 +48,6 @@ fn main_1() {
         continue;
       }
     }
-    x_41_phi = 0;
 
     continuing {
       x_41 = x_41_phi;
@@ -64,7 +63,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/color-write-in-loop/0.wgsl

@@ -1,7 +1,7 @@
 struct S {
   f0 : i32;
   f1 : mat4x3<f32>;
-};
+}
 
 var<private> gl_FragCoord : vec4<f32>;
 
@@ -63,7 +63,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.wgsl

@@ -1,8 +1,8 @@
 struct buf0 {
   injectionSwitch : vec2<f32>;
-};
+}
 
-var<private> GLF_live6tree : array<i32, 10>;
+var<private> GLF_live6tree : array<i32, 10u>;
 
 @group(0) @binding(0) var<uniform> x_9 : buf0;
 
@@ -41,7 +41,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   injectionSwitch : vec2<f32>;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_25 : buf0;
 
@@ -30,7 +30,7 @@ fn drawShape_vf2_(pos : ptr<function, vec2<f32>>) -> vec3<f32> {
   var GLF_live7_looplimiter7 : i32;
   var GLF_live7cols_1 : i32;
   var GLF_live7rows_1 : i32;
-  var GLF_live7sums : array<f32, 9>;
+  var GLF_live7sums : array<f32, 9u>;
   var GLF_live7c_1 : i32;
   var GLF_live7r_1 : i32;
   var x_180 : i32;
@@ -139,7 +139,7 @@ fn drawShape_vf2_(pos : ptr<function, vec2<f32>>) -> vec3<f32> {
             let x_62 : i32 = GLF_live7r;
             let x_63 : i32 = GLF_live7r;
             let x_64 : i32 = GLF_live7r;
-            GLF_live7m33[select(0, x_61, ((x_59 >= 0) && (x_60 < 3)))][select(0, x_64, ((x_62 >= 0) && (x_63 < 3)))] = 1.0;
+            GLF_live7m33[select(0, x_61, ((x_59 >= 0) & (x_60 < 3)))][select(0, x_64, ((x_62 >= 0) & (x_63 < 3)))] = 1.0;
             let x_267 : f32 = x_25.injectionSwitch.y;
             if ((0.0 > x_267)) {
             } else {
@@ -149,7 +149,7 @@ fn drawShape_vf2_(pos : ptr<function, vec2<f32>>) -> vec3<f32> {
               let x_68 : i32 = GLF_live7r;
               let x_69 : i32 = GLF_live7r;
               let x_70 : i32 = GLF_live7r;
-              GLF_live7m42[select(0, x_67, ((x_65 >= 0) && (x_66 < 4)))][select(0, x_70, ((x_68 >= 0) && (x_69 < 2)))] = 1.0;
+              GLF_live7m42[select(0, x_67, ((x_65 >= 0) & (x_66 < 4)))][select(0, x_70, ((x_68 >= 0) & (x_69 < 2)))] = 1.0;
             }
 
             continuing {
@@ -194,7 +194,7 @@ fn drawShape_vf2_(pos : ptr<function, vec2<f32>>) -> vec3<f32> {
       let x_83 : i32 = GLF_live7sum_index;
       let x_84 : i32 = GLF_live7sum_index;
       let x_85 : i32 = GLF_live7sum_index;
-      GLF_live7sums[select(0, x_85, ((x_83 >= 0) && (x_84 < 9)))] = 0.0;
+      GLF_live7sums[select(0, x_85, ((x_83 >= 0) & (x_84 < 9)))] = 0.0;
       GLF_live7c_1 = 0;
       loop {
         let x_86 : i32 = GLF_live7c_1;
@@ -213,7 +213,7 @@ fn drawShape_vf2_(pos : ptr<function, vec2<f32>>) -> vec3<f32> {
           let x_89 : i32 = GLF_live7sum_index;
           let x_90 : i32 = GLF_live7sum_index;
           let x_91 : i32 = GLF_live7sum_index;
-          let x_310 : i32 = select(0, x_91, ((x_89 >= 0) && (x_90 < 9)));
+          let x_310 : i32 = select(0, x_91, ((x_89 >= 0) & (x_90 < 9)));
           let x_311 : mat3x3<f32> = GLF_live7m33;
           let x_312 : mat3x3<f32> = transpose(x_311);
           let x_92 : i32 = GLF_live7c_1;
@@ -232,7 +232,7 @@ fn drawShape_vf2_(pos : ptr<function, vec2<f32>>) -> vec3<f32> {
           let x_94 : i32 = GLF_live7sum_index;
           let x_95 : i32 = GLF_live7sum_index;
           let x_96 : i32 = GLF_live7sum_index;
-          let x_332 : i32 = select(0, x_96, ((x_94 >= 0) && (x_95 < 9)));
+          let x_332 : i32 = select(0, x_96, ((x_94 >= 0) & (x_95 < 9)));
           let x_97 : i32 = GLF_live7r_1;
           let x_334 : f32 = GLF_live7m42[1][x_97];
           let x_336 : f32 = GLF_live7sums[x_332];
@@ -306,7 +306,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cosh-return-inf-unused/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   zero : f32;
-};
+}
 
 var<private> gl_FragCoord : vec4<f32>;
 
@@ -114,7 +114,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-access-array-dot/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 3>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 3>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_6 : buf1;
 
@@ -17,36 +27,36 @@ struct buf0 {
 var<private> x_GLF_color : vec4<f32>;
 
 fn main_1() {
-  var numbers : array<i32, 3>;
+  var numbers : array<i32, 3u>;
   var a : vec2<f32>;
   var b : f32;
-  let x_38 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_38 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_40 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_40 : i32 = x_6.x_GLF_uniform_int_values[0].el;
   numbers[x_38] = x_40;
-  let x_43 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_43 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-  let x_45 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_45 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   numbers[x_43] = x_45;
-  let x_48 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_48 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-  let x_50 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_50 : i32 = x_6.x_GLF_uniform_int_values[2].el;
   numbers[x_48] = x_50;
-  let x_53 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_53 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_56 : f32 = x_9.x_GLF_uniform_float_values[2];
+  let x_56 : f32 = x_9.x_GLF_uniform_float_values[2].el;
   let x_60 : i32 = numbers[select(2, 1, (0.0 < x_56))];
   a = vec2<f32>(f32(x_53), f32(x_60));
   let x_63 : vec2<f32> = a;
-  let x_65 : f32 = x_9.x_GLF_uniform_float_values[1];
+  let x_65 : f32 = x_9.x_GLF_uniform_float_values[1].el;
-  let x_67 : f32 = x_9.x_GLF_uniform_float_values[1];
+  let x_67 : f32 = x_9.x_GLF_uniform_float_values[1].el;
   b = dot(x_63, vec2<f32>(x_65, x_67));
   let x_70 : f32 = b;
-  let x_72 : f32 = x_9.x_GLF_uniform_float_values[0];
+  let x_72 : f32 = x_9.x_GLF_uniform_float_values[0].el;
   if ((x_70 == x_72)) {
-    let x_78 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_78 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_81 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_81 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_84 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_84 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_87 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_87 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     x_GLF_color = vec4<f32>(f32(x_78), f32(x_81), f32(x_84), f32(x_87));
   } else {
-    let x_91 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_91 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     let x_92 : f32 = f32(x_91);
     x_GLF_color = vec4<f32>(x_92, x_92, x_92, x_92);
   }
@@ -56,7 +66,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-analysis-reachable-from-many/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   zero : i32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_8 : buf0;
 
@@ -65,7 +65,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-and-even-numbers-from-fragcoord/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<f32, 3>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 2>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 var<private> gl_FragCoord : vec4<f32>;
 
@@ -21,24 +31,24 @@ var<private> x_GLF_color : vec4<f32>;
 fn main_1() {
   var v : vec2<i32>;
   let x_39 : f32 = gl_FragCoord.y;
-  let x_41 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_41 : f32 = x_6.x_GLF_uniform_float_values[0].el;
   if ((x_39 < x_41)) {
-    let x_47 : i32 = x_8.x_GLF_uniform_int_values[0];
+    let x_47 : i32 = x_8.x_GLF_uniform_int_values[0].el;
     let x_48 : f32 = f32(x_47);
     x_GLF_color = vec4<f32>(x_48, x_48, x_48, x_48);
   } else {
     let x_50 : vec4<f32> = gl_FragCoord;
-    let x_53 : f32 = x_6.x_GLF_uniform_float_values[1];
+    let x_53 : f32 = x_6.x_GLF_uniform_float_values[1].el;
-    let x_55 : f32 = x_6.x_GLF_uniform_float_values[0];
+    let x_55 : f32 = x_6.x_GLF_uniform_float_values[0].el;
-    let x_59 : f32 = x_6.x_GLF_uniform_float_values[2];
+    let x_59 : f32 = x_6.x_GLF_uniform_float_values[2].el;
     v = vec2<i32>(((vec2<f32>(x_50.x, x_50.y) - vec2<f32>(x_53, x_55)) * x_59));
-    let x_63 : f32 = x_6.x_GLF_uniform_float_values[1];
+    let x_63 : f32 = x_6.x_GLF_uniform_float_values[1].el;
     let x_65 : i32 = v.y;
-    let x_67 : i32 = x_8.x_GLF_uniform_int_values[1];
+    let x_67 : i32 = x_8.x_GLF_uniform_int_values[1].el;
-    let x_70 : i32 = x_8.x_GLF_uniform_int_values[1];
+    let x_70 : i32 = x_8.x_GLF_uniform_int_values[1].el;
     let x_74 : i32 = v.x;
-    let x_76 : i32 = x_8.x_GLF_uniform_int_values[1];
+    let x_76 : i32 = x_8.x_GLF_uniform_int_values[1].el;
-    let x_80 : f32 = x_6.x_GLF_uniform_float_values[1];
+    let x_80 : f32 = x_6.x_GLF_uniform_float_values[1].el;
     x_GLF_color = vec4<f32>(x_63, f32(((x_65 - x_67) & x_70)), f32((x_74 & x_76)), x_80);
   }
   return;
@@ -47,7 +57,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-acos-ldexp/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   two : i32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -25,7 +25,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-mix-nan/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 10>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 10u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 1>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_7 : buf1;
 
@@ -22,35 +32,35 @@ fn main_1() {
   var x_83 : bool;
   var x_84_phi : bool;
   nan = bitcast<f32>(-1);
-  let x_43 : i32 = x_7.x_GLF_uniform_int_values[0];
+  let x_43 : i32 = x_7.x_GLF_uniform_int_values[0].el;
-  let x_46 : i32 = x_7.x_GLF_uniform_int_values[1];
+  let x_46 : i32 = x_7.x_GLF_uniform_int_values[1].el;
-  let x_49 : i32 = x_7.x_GLF_uniform_int_values[2];
+  let x_49 : i32 = x_7.x_GLF_uniform_int_values[2].el;
-  let x_52 : i32 = x_7.x_GLF_uniform_int_values[3];
+  let x_52 : i32 = x_7.x_GLF_uniform_int_values[3].el;
-  let x_56 : i32 = x_7.x_GLF_uniform_int_values[4];
+  let x_56 : i32 = x_7.x_GLF_uniform_int_values[4].el;
-  let x_59 : i32 = x_7.x_GLF_uniform_int_values[5];
+  let x_59 : i32 = x_7.x_GLF_uniform_int_values[5].el;
-  let x_62 : i32 = x_7.x_GLF_uniform_int_values[6];
+  let x_62 : i32 = x_7.x_GLF_uniform_int_values[6].el;
-  let x_65 : i32 = x_7.x_GLF_uniform_int_values[7];
+  let x_65 : i32 = x_7.x_GLF_uniform_int_values[7].el;
   let x_68 : f32 = nan;
   undefined = mix(vec4<f32>(f32(x_43), f32(x_46), f32(x_49), f32(x_52)), vec4<f32>(f32(x_56), f32(x_59), f32(x_62), f32(x_65)), vec4<f32>(x_68, x_68, x_68, x_68));
-  let x_72 : i32 = x_7.x_GLF_uniform_int_values[0];
+  let x_72 : i32 = x_7.x_GLF_uniform_int_values[0].el;
-  let x_74 : i32 = x_7.x_GLF_uniform_int_values[9];
+  let x_74 : i32 = x_7.x_GLF_uniform_int_values[9].el;
   let x_75 : bool = (x_72 == x_74);
   x_84_phi = x_75;
   if (!(x_75)) {
     let x_80 : f32 = undefined.x;
-    let x_82 : f32 = x_9.x_GLF_uniform_float_values[0];
+    let x_82 : f32 = x_9.x_GLF_uniform_float_values[0].el;
     x_83 = (x_80 > x_82);
     x_84_phi = x_83;
   }
   let x_84 : bool = x_84_phi;
   if (x_84) {
-    let x_89 : i32 = x_7.x_GLF_uniform_int_values[0];
+    let x_89 : i32 = x_7.x_GLF_uniform_int_values[0].el;
-    let x_92 : i32 = x_7.x_GLF_uniform_int_values[8];
+    let x_92 : i32 = x_7.x_GLF_uniform_int_values[8].el;
-    let x_95 : i32 = x_7.x_GLF_uniform_int_values[8];
+    let x_95 : i32 = x_7.x_GLF_uniform_int_values[8].el;
-    let x_98 : i32 = x_7.x_GLF_uniform_int_values[0];
+    let x_98 : i32 = x_7.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_89), f32(x_92), f32(x_95), f32(x_98));
   } else {
-    let x_102 : i32 = x_7.x_GLF_uniform_int_values[8];
+    let x_102 : i32 = x_7.x_GLF_uniform_int_values[8].el;
     let x_103 : f32 = f32(x_102);
     x_GLF_color = vec4<f32>(x_103, x_103, x_103, x_103);
   }
@@ -60,7 +70,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 3>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 1>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_6 : buf1;
 
@@ -20,27 +30,27 @@ fn main_1() {
   var undefined : f32;
   var x_51 : bool;
   var x_52_phi : bool;
-  undefined = (5.0 % 0.0);
+  undefined = (5.0 - (0.0 * floor((5.0 / 0.0))));
-  let x_10 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_10 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_11 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_11 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_12 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_12 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   let x_44 : bool = (x_10 == (x_11 + x_12));
   x_52_phi = x_44;
   if (!(x_44)) {
     let x_48 : f32 = undefined;
-    let x_50 : f32 = x_8.x_GLF_uniform_float_values[0];
+    let x_50 : f32 = x_8.x_GLF_uniform_float_values[0].el;
     x_51 = (x_48 > x_50);
     x_52_phi = x_51;
   }
   let x_52 : bool = x_52_phi;
   if (x_52) {
-    let x_15 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_15 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_16 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_16 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_17 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_17 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_18 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_18 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_15), f32(x_16), f32(x_17), f32(x_18));
   } else {
-    let x_19 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_19 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     let x_66 : f32 = f32(x_19);
     x_GLF_color = vec4<f32>(x_66, x_66, x_66, x_66);
   }
@@ -50,7 +60,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl.expected.glsl

@@ -1,87 +0,0 @@
-vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr = @stride(16) array<i32, 3>;
-            ^^^^^^
-
-vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr_1 = @stride(16) array<f32, 1>;
-              ^^^^^^
-
-#version 310 es
-precision mediump float;
-
-float tint_float_modulo(float lhs, float rhs) {
-  return (lhs - rhs * trunc(lhs / rhs));
-}
-
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct tint_padded_array_element {
-  int el;
-};
-
-struct buf1 {
-  tint_padded_array_element x_GLF_uniform_int_values[3];
-};
-
-struct tint_padded_array_element_1 {
-  float el;
-};
-
-struct buf0 {
-  tint_padded_array_element_1 x_GLF_uniform_float_values[1];
-};
-
-layout(binding = 1) uniform buf1_1 {
-  tint_padded_array_element x_GLF_uniform_int_values[3];
-} x_6;
-
-layout(binding = 0) uniform buf0_1 {
-  tint_padded_array_element_1 x_GLF_uniform_float_values[1];
-} x_8;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-void main_1() {
-  float undefined = 0.0f;
-  bool x_51 = false;
-  bool x_52_phi = false;
-  undefined = tint_float_modulo(5.0f, 0.0f);
-  int x_10 = x_6.x_GLF_uniform_int_values[0].el;
-  int x_11 = x_6.x_GLF_uniform_int_values[0].el;
-  int x_12 = x_6.x_GLF_uniform_int_values[1].el;
-  bool x_44 = (x_10 == (x_11 + x_12));
-  x_52_phi = x_44;
-  if (!(x_44)) {
-    float x_48 = undefined;
-    float x_50 = x_8.x_GLF_uniform_float_values[0].el;
-    x_51 = (x_48 > x_50);
-    x_52_phi = x_51;
-  }
-  if (x_52_phi) {
-    int x_15 = x_6.x_GLF_uniform_int_values[0].el;
-    int x_16 = x_6.x_GLF_uniform_int_values[1].el;
-    int x_17 = x_6.x_GLF_uniform_int_values[1].el;
-    int x_18 = x_6.x_GLF_uniform_int_values[0].el;
-    x_GLF_color = vec4(float(x_15), float(x_16), float(x_17), float(x_18));
-  } else {
-    int x_19 = x_6.x_GLF_uniform_int_values[1].el;
-    float x_66 = float(x_19);
-    x_GLF_color = vec4(x_66, x_66, x_66, x_66);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol() {
-  main_1();
-  main_out tint_symbol_1 = main_out(x_GLF_color);
-  return tint_symbol_1;
-}
-
-void main() {
-  main_out inner_result = tint_symbol();
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-reflect-denorm/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 5>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 3>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -21,31 +31,31 @@ fn main_1() {
   var N : vec4<f32>;
   var R : vec4<f32>;
   var ref : vec4<f32>;
-  let x_40 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_40 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-  let x_43 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_43 : i32 = x_6.x_GLF_uniform_int_values[3].el;
-  let x_46 : i32 = x_6.x_GLF_uniform_int_values[4];
+  let x_46 : i32 = x_6.x_GLF_uniform_int_values[4].el;
   I = bitcast<vec4<f32>>(vec4<u32>(bitcast<u32>(x_40), bitcast<u32>(x_43), bitcast<u32>(x_46), 92985u));
-  let x_51 : f32 = x_9.x_GLF_uniform_float_values[1];
+  let x_51 : f32 = x_9.x_GLF_uniform_float_values[1].el;
   N = vec4<f32>(x_51, x_51, x_51, x_51);
   let x_53 : vec4<f32> = I;
   R = reflect(x_53, vec4<f32>(0.5, 0.5, 0.5, 0.5));
   let x_55 : vec4<f32> = I;
-  let x_57 : f32 = x_9.x_GLF_uniform_float_values[2];
+  let x_57 : f32 = x_9.x_GLF_uniform_float_values[2].el;
   let x_58 : vec4<f32> = N;
   let x_59 : vec4<f32> = I;
   let x_62 : vec4<f32> = N;
   ref = (x_55 - (x_62 * (x_57 * dot(x_58, x_59))));
   let x_65 : vec4<f32> = R;
   let x_66 : vec4<f32> = ref;
-  let x_69 : f32 = x_9.x_GLF_uniform_float_values[0];
+  let x_69 : f32 = x_9.x_GLF_uniform_float_values[0].el;
   if ((distance(x_65, x_66) < x_69)) {
-    let x_75 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_75 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_78 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_78 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_81 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_81 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_84 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_84 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_75), f32(x_78), f32(x_81), f32(x_84));
   } else {
-    let x_88 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_88 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     let x_89 : f32 = f32(x_88);
     x_GLF_color = vec4<f32>(x_89, x_89, x_89, x_89);
   }
@@ -55,7 +65,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-sinh-negative-log2/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 2>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 1>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -21,24 +31,24 @@ fn main_1() {
   var x_45 : bool;
   var x_46_phi : bool;
   undefined = sinh(0x1.8p+128);
-  let x_10 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_10 : i32 = x_6.x_GLF_uniform_int_values[0].el;
   let x_38 : bool = (1 == x_10);
   x_46_phi = x_38;
   if (!(x_38)) {
     let x_42 : f32 = undefined;
-    let x_44 : f32 = x_8.x_GLF_uniform_float_values[0];
+    let x_44 : f32 = x_8.x_GLF_uniform_float_values[0].el;
     x_45 = (x_42 > x_44);
     x_46_phi = x_45;
   }
   let x_46 : bool = x_46_phi;
   if (x_46) {
-    let x_12 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_12 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_13 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_13 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_14 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_14 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_15 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_15 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_12), f32(x_13), f32(x_14), f32(x_15));
   } else {
-    let x_16 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_16 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     let x_60 : f32 = f32(x_16);
     x_GLF_color = vec4<f32>(x_60, x_60, x_60, x_60);
   }
@@ -48,7 +58,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-tanh/0-opt.wgsl

@@ -13,7 +13,7 @@ fn main_1() {
   dist2 = distance(tanh(x_38), vec4<f32>(0.761590004, 0.964030027, 0.995050013, 0.999329984));
   let x_41 : f32 = dist1;
   let x_43 : f32 = dist2;
-  if (((x_41 < 0.100000001) && (x_43 < 0.100000001))) {
+  if (((x_41 < 0.100000001) & (x_43 < 0.100000001))) {
     x_GLF_color = vec4<f32>(1.0, 0.0, 0.0, 1.0);
   } else {
     x_GLF_color = vec4<f32>(0.0, 0.0, 0.0, 0.0);
@@ -24,7 +24,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-undefined-matrix-mul/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 12>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 12u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 1>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_6 : buf1;
 
@@ -25,24 +35,24 @@ fn main_1() {
   var v1 : vec4<f32>;
   var v2 : vec4<f32>;
   var v3 : vec4<f32>;
-  let x_17 : i32 = x_6.x_GLF_uniform_int_values[4];
+  let x_17 : i32 = x_6.x_GLF_uniform_int_values[4].el;
-  let x_18 : i32 = x_6.x_GLF_uniform_int_values[5];
+  let x_18 : i32 = x_6.x_GLF_uniform_int_values[5].el;
-  let x_19 : i32 = x_6.x_GLF_uniform_int_values[6];
+  let x_19 : i32 = x_6.x_GLF_uniform_int_values[6].el;
-  let x_20 : i32 = x_6.x_GLF_uniform_int_values[10];
+  let x_20 : i32 = x_6.x_GLF_uniform_int_values[10].el;
-  let x_21 : i32 = x_6.x_GLF_uniform_int_values[7];
+  let x_21 : i32 = x_6.x_GLF_uniform_int_values[7].el;
-  let x_22 : i32 = x_6.x_GLF_uniform_int_values[8];
+  let x_22 : i32 = x_6.x_GLF_uniform_int_values[8].el;
-  let x_23 : i32 = x_6.x_GLF_uniform_int_values[11];
+  let x_23 : i32 = x_6.x_GLF_uniform_int_values[11].el;
-  let x_24 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_24 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-  let x_25 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_25 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-  let x_26 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_26 : i32 = x_6.x_GLF_uniform_int_values[3].el;
   m0 = mat3x4<f32>(vec4<f32>(f32(x_17), f32(x_18), f32(x_19), 4.0), vec4<f32>(f32(x_20), f32(x_21), f32(x_22), 8.0), vec4<f32>(f32(x_23), f32(x_24), f32(x_25), f32(x_26)));
-  let x_27 : i32 = x_6.x_GLF_uniform_int_values[4];
+  let x_27 : i32 = x_6.x_GLF_uniform_int_values[4].el;
   let x_104 : f32 = f32(x_27);
   m1 = mat3x4<f32>(vec4<f32>(x_104, 0.0, 0.0, 0.0), vec4<f32>(0.0, x_104, 0.0, 0.0), vec4<f32>(0.0, 0.0, x_104, 0.0));
   undefined = ldexp(vec3<f32>(1.0, 1.0, 1.0), vec3<i32>(500, 500, 500));
-  let x_28 : i32 = x_6.x_GLF_uniform_int_values[4];
+  let x_28 : i32 = x_6.x_GLF_uniform_int_values[4].el;
   let x_111 : f32 = f32(x_28);
-  let x_29 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_29 : i32 = x_6.x_GLF_uniform_int_values[0].el;
   defined = ldexp(vec3<f32>(x_111, x_111, x_111), vec3<i32>(x_29, x_29, x_29));
   let x_116 : mat3x4<f32> = m0;
   let x_117 : vec3<f32> = undefined;
@@ -59,20 +69,20 @@ fn main_1() {
   let x_129 : f32 = v2.x;
   let x_131 : f32 = v3.x;
   if ((x_129 > x_131)) {
-    let x_30 : i32 = x_6.x_GLF_uniform_int_values[4];
+    let x_30 : i32 = x_6.x_GLF_uniform_int_values[4].el;
-    let x_31 : i32 = x_6.x_GLF_uniform_int_values[9];
+    let x_31 : i32 = x_6.x_GLF_uniform_int_values[9].el;
-    let x_32 : i32 = x_6.x_GLF_uniform_int_values[9];
+    let x_32 : i32 = x_6.x_GLF_uniform_int_values[9].el;
-    let x_33 : i32 = x_6.x_GLF_uniform_int_values[4];
+    let x_33 : i32 = x_6.x_GLF_uniform_int_values[4].el;
     x_GLF_color = vec4<f32>(f32(x_30), f32(x_31), f32(x_32), f32(x_33));
   } else {
-    let x_34 : i32 = x_6.x_GLF_uniform_int_values[9];
+    let x_34 : i32 = x_6.x_GLF_uniform_int_values[9].el;
     let x_146 : f32 = f32(x_34);
     x_GLF_color = vec4<f32>(x_146, x_146, x_146, x_146);
   }
   let x_149 : f32 = v0.x;
   let x_151 : f32 = v1.x;
   if ((x_149 < x_151)) {
-    let x_156 : f32 = x_15.x_GLF_uniform_float_values[0];
+    let x_156 : f32 = x_15.x_GLF_uniform_float_values[0].el;
     x_GLF_color.y = x_156;
   }
   return;
@@ -81,7 +91,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl

@@ -1,64 +0,0 @@
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct strided_arr {
-  int el;
-};
-
-struct buf0 {
-  strided_arr x_GLF_uniform_int_values[3];
-};
-
-layout(binding = 0) uniform buf0_1 {
-  strided_arr x_GLF_uniform_int_values[3];
-} x_6;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-void main_1() {
-  int i = 0;
-  vec4 v = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-  int x_30 = x_6.x_GLF_uniform_int_values[1].el;
-  i = x_30;
-  while (true) {
-    int x_35 = i;
-    int x_37 = x_6.x_GLF_uniform_int_values[2].el;
-    if ((x_35 < x_37)) {
-    } else {
-      break;
-    }
-    v = unpackUnorm4x8(100u);
-    float x_42 = v.x;
-    if ((int(x_42) > i)) {
-      int x_49 = x_6.x_GLF_uniform_int_values[1].el;
-      float x_50 = float(x_49);
-      x_GLF_color = vec4(x_50, x_50, x_50, x_50);
-      return;
-    }
-    {
-      i = (i + 1);
-    }
-  }
-  int x_55 = x_6.x_GLF_uniform_int_values[0].el;
-  int x_58 = x_6.x_GLF_uniform_int_values[1].el;
-  int x_61 = x_6.x_GLF_uniform_int_values[1].el;
-  int x_64 = x_6.x_GLF_uniform_int_values[0].el;
-  x_GLF_color = vec4(float(x_55), float(x_58), float(x_61), float(x_64));
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol() {
-  main_1();
-  main_out tint_symbol_1 = main_out(x_GLF_color);
-  return tint_symbol_1;
-}
-
-void main() {
-  main_out inner_result = tint_symbol();
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<i32, 3>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -11,11 +16,11 @@ var<private> x_GLF_color : vec4<f32>;
 fn main_1() {
   var i : i32;
   var v : vec4<f32>;
-  let x_30 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_30 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   i = x_30;
   loop {
     let x_35 : i32 = i;
-    let x_37 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_37 : i32 = x_6.x_GLF_uniform_int_values[2].el;
     if ((x_35 < x_37)) {
     } else {
       break;
@@ -24,7 +29,7 @@ fn main_1() {
     let x_42 : f32 = v.x;
     let x_44 : i32 = i;
     if ((i32(x_42) > x_44)) {
-      let x_49 : i32 = x_6.x_GLF_uniform_int_values[1];
+      let x_49 : i32 = x_6.x_GLF_uniform_int_values[1].el;
       let x_50 : f32 = f32(x_49);
       x_GLF_color = vec4<f32>(x_50, x_50, x_50, x_50);
       return;
@@ -35,10 +40,10 @@ fn main_1() {
       i = (x_52 + 1);
     }
   }
-  let x_55 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_55 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_58 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_58 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-  let x_61 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_61 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-  let x_64 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_64 : i32 = x_6.x_GLF_uniform_int_values[0].el;
   x_GLF_color = vec4<f32>(f32(x_55), f32(x_58), f32(x_61), f32(x_64));
   return;
 }
@@ -46,7 +51,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl.expected.glsl

@@ -1,68 +0,0 @@
-vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr = @stride(16) array<i32, 3>;
-            ^^^^^^
-
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct tint_padded_array_element {
-  int el;
-};
-
-struct buf0 {
-  tint_padded_array_element x_GLF_uniform_int_values[3];
-};
-
-layout(binding = 0) uniform buf0_1 {
-  tint_padded_array_element x_GLF_uniform_int_values[3];
-} x_6;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-void main_1() {
-  int i = 0;
-  vec4 v = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-  int x_30 = x_6.x_GLF_uniform_int_values[1].el;
-  i = x_30;
-  while (true) {
-    int x_35 = i;
-    int x_37 = x_6.x_GLF_uniform_int_values[2].el;
-    if ((x_35 < x_37)) {
-    } else {
-      break;
-    }
-    v = unpackUnorm4x8(100u);
-    float x_42 = v.x;
-    if ((int(x_42) > i)) {
-      int x_49 = x_6.x_GLF_uniform_int_values[1].el;
-      float x_50 = float(x_49);
-      x_GLF_color = vec4(x_50, x_50, x_50, x_50);
-      return;
-    }
-    {
-      i = (i + 1);
-    }
-  }
-  int x_55 = x_6.x_GLF_uniform_int_values[0].el;
-  int x_58 = x_6.x_GLF_uniform_int_values[1].el;
-  int x_61 = x_6.x_GLF_uniform_int_values[1].el;
-  int x_64 = x_6.x_GLF_uniform_int_values[0].el;
-  x_GLF_color = vec4(float(x_55), float(x_58), float(x_61), float(x_64));
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol() {
-  main_1();
-  main_out tint_symbol_1 = main_out(x_GLF_color);
-  return tint_symbol_1;
-}
-
-void main() {
-  main_out inner_result = tint_symbol();
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 3>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 1>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_7 : buf0;
 
@@ -19,39 +29,39 @@ var<private> gl_FragCoord : vec4<f32>;
 var<private> x_GLF_color : vec4<f32>;
 
 fn main_1() {
-  var arr : array<i32, 3>;
+  var arr : array<i32, 3u>;
   var a : i32;
   var b : i32;
   var c : i32;
-  let x_40 : i32 = x_7.x_GLF_uniform_int_values[1];
+  let x_40 : i32 = x_7.x_GLF_uniform_int_values[1].el;
-  let x_42 : i32 = x_7.x_GLF_uniform_int_values[1];
+  let x_42 : i32 = x_7.x_GLF_uniform_int_values[1].el;
-  let x_44 : i32 = x_7.x_GLF_uniform_int_values[1];
+  let x_44 : i32 = x_7.x_GLF_uniform_int_values[1].el;
-  arr = array<i32, 3>(x_40, x_42, x_44);
+  arr = array<i32, 3u>(x_40, x_42, x_44);
-  let x_47 : i32 = x_7.x_GLF_uniform_int_values[0];
+  let x_47 : i32 = x_7.x_GLF_uniform_int_values[0].el;
   let x_49 : i32 = arr[x_47];
   a = x_49;
   let x_50 : i32 = a;
   b = (x_50 - 1);
   let x_53 : f32 = gl_FragCoord.x;
-  let x_55 : f32 = x_11.x_GLF_uniform_float_values[0];
+  let x_55 : f32 = x_11.x_GLF_uniform_float_values[0].el;
   if ((x_53 < x_55)) {
     let x_59 : i32 = b;
     b = (x_59 + 1);
   }
-  let x_62 : i32 = x_7.x_GLF_uniform_int_values[0];
+  let x_62 : i32 = x_7.x_GLF_uniform_int_values[0].el;
   c = x_62;
   let x_63 : i32 = c;
-  let x_65 : i32 = x_7.x_GLF_uniform_int_values[1];
+  let x_65 : i32 = x_7.x_GLF_uniform_int_values[1].el;
-  let x_67 : i32 = x_7.x_GLF_uniform_int_values[2];
+  let x_67 : i32 = x_7.x_GLF_uniform_int_values[2].el;
   let x_69 : i32 = b;
   arr[clamp(x_63, x_65, x_67)] = x_69;
-  let x_72 : i32 = x_7.x_GLF_uniform_int_values[0];
+  let x_72 : i32 = x_7.x_GLF_uniform_int_values[0].el;
   let x_74 : i32 = arr[x_72];
-  let x_77 : i32 = x_7.x_GLF_uniform_int_values[1];
+  let x_77 : i32 = x_7.x_GLF_uniform_int_values[1].el;
   let x_79 : i32 = arr[x_77];
-  let x_82 : i32 = x_7.x_GLF_uniform_int_values[1];
+  let x_82 : i32 = x_7.x_GLF_uniform_int_values[1].el;
   let x_84 : i32 = arr[x_82];
-  let x_87 : i32 = x_7.x_GLF_uniform_int_values[2];
+  let x_87 : i32 = x_7.x_GLF_uniform_int_values[2].el;
   let x_89 : i32 = arr[x_87];
   x_GLF_color = vec4<f32>(f32(x_74), f32(x_79), f32(x_84), f32(x_89));
   return;
@@ -60,7 +70,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl

@@ -1,12 +1,17 @@
-type Arr = @stride(16) array<i32, 20>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 20u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 struct buf1 {
   one : i32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -15,8 +20,8 @@ var<private> x_GLF_color : vec4<f32>;
 @group(0) @binding(1) var<uniform> x_19 : buf1;
 
 fn main_1() {
-  var arr0 : array<i32, 10>;
+  var arr0 : array<i32, 10u>;
-  var arr1 : array<i32, 10>;
+  var arr1 : array<i32, 10u>;
   var a : i32;
   var limiter0 : i32;
   var limiter1 : i32;
@@ -24,64 +29,64 @@ fn main_1() {
   var limiter2 : i32;
   var limiter3 : i32;
   var d : i32;
-  var ref0 : array<i32, 10>;
+  var ref0 : array<i32, 10u>;
-  var ref1 : array<i32, 10>;
+  var ref1 : array<i32, 10u>;
   var i : i32;
-  let x_59 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_59 : i32 = x_6.x_GLF_uniform_int_values[3].el;
-  let x_61 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_61 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-  let x_63 : i32 = x_6.x_GLF_uniform_int_values[4];
+  let x_63 : i32 = x_6.x_GLF_uniform_int_values[4].el;
-  let x_65 : i32 = x_6.x_GLF_uniform_int_values[5];
+  let x_65 : i32 = x_6.x_GLF_uniform_int_values[5].el;
-  let x_67 : i32 = x_6.x_GLF_uniform_int_values[6];
+  let x_67 : i32 = x_6.x_GLF_uniform_int_values[6].el;
-  let x_69 : i32 = x_6.x_GLF_uniform_int_values[7];
+  let x_69 : i32 = x_6.x_GLF_uniform_int_values[7].el;
-  let x_71 : i32 = x_6.x_GLF_uniform_int_values[8];
+  let x_71 : i32 = x_6.x_GLF_uniform_int_values[8].el;
-  let x_73 : i32 = x_6.x_GLF_uniform_int_values[9];
+  let x_73 : i32 = x_6.x_GLF_uniform_int_values[9].el;
-  let x_75 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_75 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_77 : i32 = x_6.x_GLF_uniform_int_values[10];
+  let x_77 : i32 = x_6.x_GLF_uniform_int_values[10].el;
-  arr0 = array<i32, 10>(x_59, x_61, x_63, x_65, x_67, x_69, x_71, x_73, x_75, x_77);
+  arr0 = array<i32, 10u>(x_59, x_61, x_63, x_65, x_67, x_69, x_71, x_73, x_75, x_77);
-  let x_80 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_80 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-  let x_82 : i32 = x_6.x_GLF_uniform_int_values[12];
+  let x_82 : i32 = x_6.x_GLF_uniform_int_values[12].el;
-  let x_84 : i32 = x_6.x_GLF_uniform_int_values[15];
+  let x_84 : i32 = x_6.x_GLF_uniform_int_values[15].el;
-  let x_86 : i32 = x_6.x_GLF_uniform_int_values[16];
+  let x_86 : i32 = x_6.x_GLF_uniform_int_values[16].el;
-  let x_88 : i32 = x_6.x_GLF_uniform_int_values[17];
+  let x_88 : i32 = x_6.x_GLF_uniform_int_values[17].el;
-  let x_90 : i32 = x_6.x_GLF_uniform_int_values[13];
+  let x_90 : i32 = x_6.x_GLF_uniform_int_values[13].el;
-  let x_92 : i32 = x_6.x_GLF_uniform_int_values[14];
+  let x_92 : i32 = x_6.x_GLF_uniform_int_values[14].el;
-  let x_94 : i32 = x_6.x_GLF_uniform_int_values[11];
+  let x_94 : i32 = x_6.x_GLF_uniform_int_values[11].el;
-  let x_96 : i32 = x_6.x_GLF_uniform_int_values[18];
+  let x_96 : i32 = x_6.x_GLF_uniform_int_values[18].el;
-  let x_98 : i32 = x_6.x_GLF_uniform_int_values[19];
+  let x_98 : i32 = x_6.x_GLF_uniform_int_values[19].el;
-  arr1 = array<i32, 10>(x_80, x_82, x_84, x_86, x_88, x_90, x_92, x_94, x_96, x_98);
+  arr1 = array<i32, 10u>(x_80, x_82, x_84, x_86, x_88, x_90, x_92, x_94, x_96, x_98);
-  let x_101 : i32 = x_6.x_GLF_uniform_int_values[8];
+  let x_101 : i32 = x_6.x_GLF_uniform_int_values[8].el;
   a = x_101;
   loop {
     let x_106 : i32 = a;
-    let x_108 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_108 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     if ((x_106 < x_108)) {
     } else {
       break;
     }
-    let x_112 : i32 = x_6.x_GLF_uniform_int_values[3];
+    let x_112 : i32 = x_6.x_GLF_uniform_int_values[3].el;
     limiter0 = x_112;
     loop {
       let x_117 : i32 = limiter0;
-      let x_119 : i32 = x_6.x_GLF_uniform_int_values[4];
+      let x_119 : i32 = x_6.x_GLF_uniform_int_values[4].el;
       if ((x_117 < x_119)) {
       } else {
         break;
       }
       let x_122 : i32 = limiter0;
       limiter0 = (x_122 + 1);
-      let x_125 : i32 = x_6.x_GLF_uniform_int_values[2];
+      let x_125 : i32 = x_6.x_GLF_uniform_int_values[2].el;
       limiter1 = x_125;
-      let x_127 : i32 = x_6.x_GLF_uniform_int_values[3];
+      let x_127 : i32 = x_6.x_GLF_uniform_int_values[3].el;
       b = x_127;
       loop {
         let x_132 : i32 = b;
-        let x_134 : i32 = x_6.x_GLF_uniform_int_values[1];
+        let x_134 : i32 = x_6.x_GLF_uniform_int_values[1].el;
         if ((x_132 < x_134)) {
         } else {
           break;
         }
         let x_137 : i32 = limiter1;
-        let x_139 : i32 = x_6.x_GLF_uniform_int_values[5];
+        let x_139 : i32 = x_6.x_GLF_uniform_int_values[5].el;
         if ((x_137 > x_139)) {
           break;
         }
@@ -137,8 +142,8 @@ fn main_1() {
       }
 
       continuing {
-        let x_189 : i32 = x_6.x_GLF_uniform_int_values[2];
+        let x_189 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-        let x_191 : i32 = x_6.x_GLF_uniform_int_values[3];
+        let x_191 : i32 = x_6.x_GLF_uniform_int_values[3].el;
         if ((x_189 == x_191)) {
         } else {
           break;
@@ -151,40 +156,40 @@ fn main_1() {
       a = (x_193 + 1);
     }
   }
-  let x_196 : i32 = x_6.x_GLF_uniform_int_values[11];
+  let x_196 : i32 = x_6.x_GLF_uniform_int_values[11].el;
-  let x_198 : i32 = x_6.x_GLF_uniform_int_values[12];
+  let x_198 : i32 = x_6.x_GLF_uniform_int_values[12].el;
-  let x_200 : i32 = x_6.x_GLF_uniform_int_values[11];
+  let x_200 : i32 = x_6.x_GLF_uniform_int_values[11].el;
-  let x_202 : i32 = x_6.x_GLF_uniform_int_values[5];
+  let x_202 : i32 = x_6.x_GLF_uniform_int_values[5].el;
-  let x_204 : i32 = x_6.x_GLF_uniform_int_values[6];
+  let x_204 : i32 = x_6.x_GLF_uniform_int_values[6].el;
-  let x_206 : i32 = x_6.x_GLF_uniform_int_values[7];
+  let x_206 : i32 = x_6.x_GLF_uniform_int_values[7].el;
-  let x_208 : i32 = x_6.x_GLF_uniform_int_values[8];
+  let x_208 : i32 = x_6.x_GLF_uniform_int_values[8].el;
-  let x_210 : i32 = x_6.x_GLF_uniform_int_values[9];
+  let x_210 : i32 = x_6.x_GLF_uniform_int_values[9].el;
-  let x_212 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_212 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_214 : i32 = x_6.x_GLF_uniform_int_values[10];
+  let x_214 : i32 = x_6.x_GLF_uniform_int_values[10].el;
-  ref0 = array<i32, 10>(x_196, x_198, x_200, x_202, x_204, x_206, x_208, x_210, x_212, x_214);
+  ref0 = array<i32, 10u>(x_196, x_198, x_200, x_202, x_204, x_206, x_208, x_210, x_212, x_214);
-  let x_217 : i32 = x_6.x_GLF_uniform_int_values[11];
+  let x_217 : i32 = x_6.x_GLF_uniform_int_values[11].el;
-  let x_219 : i32 = x_6.x_GLF_uniform_int_values[12];
+  let x_219 : i32 = x_6.x_GLF_uniform_int_values[12].el;
-  let x_221 : i32 = x_6.x_GLF_uniform_int_values[11];
+  let x_221 : i32 = x_6.x_GLF_uniform_int_values[11].el;
-  let x_223 : i32 = x_6.x_GLF_uniform_int_values[5];
+  let x_223 : i32 = x_6.x_GLF_uniform_int_values[5].el;
-  let x_225 : i32 = x_6.x_GLF_uniform_int_values[6];
+  let x_225 : i32 = x_6.x_GLF_uniform_int_values[6].el;
-  let x_227 : i32 = x_6.x_GLF_uniform_int_values[13];
+  let x_227 : i32 = x_6.x_GLF_uniform_int_values[13].el;
-  let x_229 : i32 = x_6.x_GLF_uniform_int_values[14];
+  let x_229 : i32 = x_6.x_GLF_uniform_int_values[14].el;
-  let x_231 : i32 = x_6.x_GLF_uniform_int_values[11];
+  let x_231 : i32 = x_6.x_GLF_uniform_int_values[11].el;
-  let x_233 : i32 = x_6.x_GLF_uniform_int_values[18];
+  let x_233 : i32 = x_6.x_GLF_uniform_int_values[18].el;
-  let x_235 : i32 = x_6.x_GLF_uniform_int_values[19];
+  let x_235 : i32 = x_6.x_GLF_uniform_int_values[19].el;
-  ref1 = array<i32, 10>(x_217, x_219, x_221, x_223, x_225, x_227, x_229, x_231, x_233, x_235);
+  ref1 = array<i32, 10u>(x_217, x_219, x_221, x_223, x_225, x_227, x_229, x_231, x_233, x_235);
-  let x_238 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_238 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-  let x_241 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_241 : i32 = x_6.x_GLF_uniform_int_values[3].el;
-  let x_244 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_244 : i32 = x_6.x_GLF_uniform_int_values[3].el;
-  let x_247 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_247 : i32 = x_6.x_GLF_uniform_int_values[2].el;
   x_GLF_color = vec4<f32>(f32(x_238), f32(x_241), f32(x_244), f32(x_247));
-  let x_251 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_251 : i32 = x_6.x_GLF_uniform_int_values[3].el;
   i = x_251;
   loop {
     var x_277 : bool;
     var x_278_phi : bool;
     let x_256 : i32 = i;
-    let x_258 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_258 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     if ((x_256 < x_258)) {
     } else {
       break;
@@ -205,7 +210,7 @@ fn main_1() {
     }
     let x_278 : bool = x_278_phi;
     if (x_278) {
-      let x_282 : i32 = x_6.x_GLF_uniform_int_values[3];
+      let x_282 : i32 = x_6.x_GLF_uniform_int_values[3].el;
       let x_283 : f32 = f32(x_282);
       x_GLF_color = vec4<f32>(x_283, x_283, x_283, x_283);
     }
@@ -221,7 +226,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-asin-undefined-smoothstep/0-opt.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<f32, 7>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 7u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -21,13 +26,13 @@ fn main_1() {
   var x_78_phi : bool;
   var x_86_phi : bool;
   var x_94_phi : bool;
-  let x_41 : f32 = x_6.x_GLF_uniform_float_values[2];
+  let x_41 : f32 = x_6.x_GLF_uniform_float_values[2].el;
-  let x_43 : f32 = x_6.x_GLF_uniform_float_values[2];
+  let x_43 : f32 = x_6.x_GLF_uniform_float_values[2].el;
-  let x_45 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_45 : f32 = x_6.x_GLF_uniform_float_values[0].el;
-  let x_47 : f32 = x_6.x_GLF_uniform_float_values[2];
+  let x_47 : f32 = x_6.x_GLF_uniform_float_values[2].el;
   v1 = vec4<f32>(x_41, x_43, x_45, x_47);
   v2 = vec4<f32>(1.570796371, 1.119769573, 0x1.8p+128, 0.927295208);
-  let x_50 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_50 : f32 = x_6.x_GLF_uniform_float_values[0].el;
   v3 = vec4<f32>(x_50, x_50, x_50, x_50);
   let x_52 : vec4<f32> = v1;
   let x_53 : vec4<f32> = v2;
@@ -36,12 +41,12 @@ fn main_1() {
   let x_56 : vec4<f32> = v4;
   x_GLF_color = vec4<f32>(x_56.x, x_56.y, x_56.w, x_56.x);
   let x_59 : f32 = v4.x;
-  let x_61 : f32 = x_6.x_GLF_uniform_float_values[4];
+  let x_61 : f32 = x_6.x_GLF_uniform_float_values[4].el;
   let x_62 : bool = (x_59 > x_61);
   x_70_phi = x_62;
   if (x_62) {
     let x_66 : f32 = v4.x;
-    let x_68 : f32 = x_6.x_GLF_uniform_float_values[5];
+    let x_68 : f32 = x_6.x_GLF_uniform_float_values[5].el;
     x_69 = (x_66 < x_68);
     x_70_phi = x_69;
   }
@@ -49,7 +54,7 @@ fn main_1() {
   x_78_phi = x_70;
   if (x_70) {
     let x_74 : f32 = v4.y;
-    let x_76 : f32 = x_6.x_GLF_uniform_float_values[3];
+    let x_76 : f32 = x_6.x_GLF_uniform_float_values[3].el;
     x_77 = (x_74 > x_76);
     x_78_phi = x_77;
   }
@@ -57,7 +62,7 @@ fn main_1() {
   x_86_phi = x_78;
   if (x_78) {
     let x_82 : f32 = v4.y;
-    let x_84 : f32 = x_6.x_GLF_uniform_float_values[6];
+    let x_84 : f32 = x_6.x_GLF_uniform_float_values[6].el;
     x_85 = (x_82 < x_84);
     x_86_phi = x_85;
   }
@@ -65,19 +70,19 @@ fn main_1() {
   x_94_phi = x_86;
   if (x_86) {
     let x_90 : f32 = v4.w;
-    let x_92 : f32 = x_6.x_GLF_uniform_float_values[0];
+    let x_92 : f32 = x_6.x_GLF_uniform_float_values[0].el;
     x_93 = (x_90 == x_92);
     x_94_phi = x_93;
   }
   let x_94 : bool = x_94_phi;
   if (x_94) {
-    let x_99 : f32 = x_6.x_GLF_uniform_float_values[0];
+    let x_99 : f32 = x_6.x_GLF_uniform_float_values[0].el;
-    let x_101 : f32 = x_6.x_GLF_uniform_float_values[1];
+    let x_101 : f32 = x_6.x_GLF_uniform_float_values[1].el;
-    let x_103 : f32 = x_6.x_GLF_uniform_float_values[1];
+    let x_103 : f32 = x_6.x_GLF_uniform_float_values[1].el;
-    let x_105 : f32 = x_6.x_GLF_uniform_float_values[0];
+    let x_105 : f32 = x_6.x_GLF_uniform_float_values[0].el;
     x_GLF_color = vec4<f32>(x_99, x_101, x_103, x_105);
   } else {
-    let x_108 : f32 = x_6.x_GLF_uniform_float_values[1];
+    let x_108 : f32 = x_6.x_GLF_uniform_float_values[1].el;
     x_GLF_color = vec4<f32>(x_108, x_108, x_108, x_108);
   }
   return;
@@ -86,7 +91,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-atan-trunc-vec4/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 2>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 2>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_6 : buf1;
 
@@ -21,31 +31,31 @@ fn main_1() {
   var f : f32;
   var x_56 : bool;
   var x_57_phi : bool;
-  let x_32 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_32 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_35 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_35 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_38 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_38 : i32 = x_6.x_GLF_uniform_int_values[0].el;
   v = vec4<f32>(f32(x_32), f32(x_35), -621.596008301, f32(x_38));
   let x_41 : vec4<f32> = v;
   f = atan(trunc(x_41)).z;
   let x_45 : f32 = f;
-  let x_47 : f32 = x_9.x_GLF_uniform_float_values[0];
+  let x_47 : f32 = x_9.x_GLF_uniform_float_values[0].el;
   let x_49 : bool = (x_45 > -(x_47));
   x_57_phi = x_49;
   if (x_49) {
     let x_52 : f32 = f;
-    let x_54 : f32 = x_9.x_GLF_uniform_float_values[1];
+    let x_54 : f32 = x_9.x_GLF_uniform_float_values[1].el;
     x_56 = (x_52 < -(x_54));
     x_57_phi = x_56;
   }
   let x_57 : bool = x_57_phi;
   if (x_57) {
-    let x_62 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_62 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_65 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_65 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_68 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_68 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_71 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_71 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     x_GLF_color = vec4<f32>(f32(x_62), f32(x_65), f32(x_68), f32(x_71));
   } else {
-    let x_75 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_75 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     let x_76 : f32 = f32(x_75);
     x_GLF_color = vec4<f32>(x_76, x_76, x_76, x_76);
   }
@@ -55,7 +65,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-basic-block-discard-in-function/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   zero : i32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_9 : buf0;
 
@@ -49,7 +49,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl

@@ -1,85 +0,0 @@
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct strided_arr {
-  float el;
-};
-
-struct buf0 {
-  strided_arr x_GLF_uniform_float_values[1];
-};
-
-struct strided_arr_1 {
-  int el;
-};
-
-struct buf1 {
-  strided_arr_1 x_GLF_uniform_int_values[3];
-};
-
-vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-layout(binding = 0) uniform buf0_1 {
-  strided_arr x_GLF_uniform_float_values[1];
-} x_8;
-
-layout(binding = 1) uniform buf1_1 {
-  strided_arr_1 x_GLF_uniform_int_values[3];
-} x_11;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-int f1_() {
-  int a = 0;
-  int i = 0;
-  a = 256;
-  float x_65 = tint_symbol.y;
-  float x_67 = x_8.x_GLF_uniform_float_values[0].el;
-  if ((x_65 > x_67)) {
-    a = (a + 1);
-  }
-  i = int(bitCount(a));
-  int x_75 = i;
-  int x_77 = x_11.x_GLF_uniform_int_values[0].el;
-  if ((x_75 < x_77)) {
-    int x_82 = x_11.x_GLF_uniform_int_values[0].el;
-    return x_82;
-  }
-  return i;
-}
-
-void main_1() {
-  int a_1 = 0;
-  int x_38 = f1_();
-  a_1 = x_38;
-  int x_39 = a_1;
-  int x_41 = x_11.x_GLF_uniform_int_values[2].el;
-  if ((x_39 == x_41)) {
-    int x_47 = x_11.x_GLF_uniform_int_values[0].el;
-    int x_50 = x_11.x_GLF_uniform_int_values[1].el;
-    int x_53 = x_11.x_GLF_uniform_int_values[1].el;
-    int x_56 = x_11.x_GLF_uniform_int_values[0].el;
-    x_GLF_color = vec4(float(x_47), float(x_50), float(x_53), float(x_56));
-  } else {
-    int x_60 = x_11.x_GLF_uniform_int_values[1].el;
-    float x_61 = float(x_60);
-    x_GLF_color = vec4(x_61, x_61, x_61, x_61);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol_1(vec4 tint_symbol_2) {
-  tint_symbol = tint_symbol_2;
-  main_1();
-  main_out tint_symbol_3 = main_out(x_GLF_color);
-  return tint_symbol_3;
-}
-
-void main() {
-  main_out inner_result = tint_symbol_1(gl_FragCoord);
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<f32, 1>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 3>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 var<private> gl_FragCoord : vec4<f32>;
 
@@ -23,7 +33,7 @@ fn f1_() -> i32 {
   var i : i32;
   a = 256;
   let x_65 : f32 = gl_FragCoord.y;
-  let x_67 : f32 = x_8.x_GLF_uniform_float_values[0];
+  let x_67 : f32 = x_8.x_GLF_uniform_float_values[0].el;
   if ((x_65 > x_67)) {
     let x_71 : i32 = a;
     a = (x_71 + 1);
@@ -31,9 +41,9 @@ fn f1_() -> i32 {
   let x_73 : i32 = a;
   i = countOneBits(x_73);
   let x_75 : i32 = i;
-  let x_77 : i32 = x_11.x_GLF_uniform_int_values[0];
+  let x_77 : i32 = x_11.x_GLF_uniform_int_values[0].el;
   if ((x_75 < x_77)) {
-    let x_82 : i32 = x_11.x_GLF_uniform_int_values[0];
+    let x_82 : i32 = x_11.x_GLF_uniform_int_values[0].el;
     return x_82;
   }
   let x_83 : i32 = i;
@@ -45,15 +55,15 @@ fn main_1() {
   let x_38 : i32 = f1_();
   a_1 = x_38;
   let x_39 : i32 = a_1;
-  let x_41 : i32 = x_11.x_GLF_uniform_int_values[2];
+  let x_41 : i32 = x_11.x_GLF_uniform_int_values[2].el;
   if ((x_39 == x_41)) {
-    let x_47 : i32 = x_11.x_GLF_uniform_int_values[0];
+    let x_47 : i32 = x_11.x_GLF_uniform_int_values[0].el;
-    let x_50 : i32 = x_11.x_GLF_uniform_int_values[1];
+    let x_50 : i32 = x_11.x_GLF_uniform_int_values[1].el;
-    let x_53 : i32 = x_11.x_GLF_uniform_int_values[1];
+    let x_53 : i32 = x_11.x_GLF_uniform_int_values[1].el;
-    let x_56 : i32 = x_11.x_GLF_uniform_int_values[0];
+    let x_56 : i32 = x_11.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_47), f32(x_50), f32(x_53), f32(x_56));
   } else {
-    let x_60 : i32 = x_11.x_GLF_uniform_int_values[1];
+    let x_60 : i32 = x_11.x_GLF_uniform_int_values[1].el;
     let x_61 : f32 = f32(x_60);
     x_GLF_color = vec4<f32>(x_61, x_61, x_61, x_61);
   }
@@ -63,7 +73,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl.expected.glsl

@@ -1,93 +0,0 @@
-vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr = @stride(16) array<f32, 1>;
-            ^^^^^^
-
-vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr_1 = @stride(16) array<i32, 3>;
-              ^^^^^^
-
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct tint_padded_array_element {
-  float el;
-};
-
-struct buf0 {
-  tint_padded_array_element x_GLF_uniform_float_values[1];
-};
-
-struct tint_padded_array_element_1 {
-  int el;
-};
-
-struct buf1 {
-  tint_padded_array_element_1 x_GLF_uniform_int_values[3];
-};
-
-vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-layout(binding = 0) uniform buf0_1 {
-  tint_padded_array_element x_GLF_uniform_float_values[1];
-} x_8;
-
-layout(binding = 1) uniform buf1_1 {
-  tint_padded_array_element_1 x_GLF_uniform_int_values[3];
-} x_11;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-int f1_() {
-  int a = 0;
-  int i = 0;
-  a = 256;
-  float x_65 = tint_symbol.y;
-  float x_67 = x_8.x_GLF_uniform_float_values[0].el;
-  if ((x_65 > x_67)) {
-    a = (a + 1);
-  }
-  i = int(bitCount(a));
-  int x_75 = i;
-  int x_77 = x_11.x_GLF_uniform_int_values[0].el;
-  if ((x_75 < x_77)) {
-    int x_82 = x_11.x_GLF_uniform_int_values[0].el;
-    return x_82;
-  }
-  return i;
-}
-
-void main_1() {
-  int a_1 = 0;
-  int x_38 = f1_();
-  a_1 = x_38;
-  int x_39 = a_1;
-  int x_41 = x_11.x_GLF_uniform_int_values[2].el;
-  if ((x_39 == x_41)) {
-    int x_47 = x_11.x_GLF_uniform_int_values[0].el;
-    int x_50 = x_11.x_GLF_uniform_int_values[1].el;
-    int x_53 = x_11.x_GLF_uniform_int_values[1].el;
-    int x_56 = x_11.x_GLF_uniform_int_values[0].el;
-    x_GLF_color = vec4(float(x_47), float(x_50), float(x_53), float(x_56));
-  } else {
-    int x_60 = x_11.x_GLF_uniform_int_values[1].el;
-    float x_61 = float(x_60);
-    x_GLF_color = vec4(x_61, x_61, x_61, x_61);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol_1(vec4 tint_symbol_2) {
-  tint_symbol = tint_symbol_2;
-  main_1();
-  main_out tint_symbol_3 = main_out(x_GLF_color);
-  return tint_symbol_3;
-}
-
-void main() {
-  main_out inner_result = tint_symbol_1(gl_FragCoord);
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl

@@ -1,79 +0,0 @@
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct strided_arr {
-  int el;
-};
-
-struct buf0 {
-  strided_arr x_GLF_uniform_int_values[4];
-};
-
-layout(binding = 0) uniform buf0_1 {
-  strided_arr x_GLF_uniform_int_values[4];
-} x_5;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-void main_1() {
-  int x_28 = 0;
-  int x_29 = 0;
-  int x_28_phi = 0;
-  int x_31_phi = 0;
-  int x_42_phi = 0;
-  int x_24 = min(1, bitfieldReverse(1));
-  int x_26 = x_5.x_GLF_uniform_int_values[3].el;
-  x_28_phi = x_26;
-  x_31_phi = 1;
-  while (true) {
-    int x_32 = 0;
-    x_28 = x_28_phi;
-    int x_31 = x_31_phi;
-    x_42_phi = x_28;
-    if ((x_31 <= (x_24 - 1))) {
-    } else {
-      break;
-    }
-    x_29 = (x_28 + x_31);
-    int x_38 = x_5.x_GLF_uniform_int_values[0].el;
-    if ((x_38 == 1)) {
-      x_42_phi = x_29;
-      break;
-    }
-    {
-      x_32 = (x_31 + 1);
-      x_28_phi = x_29;
-      x_31_phi = x_32;
-    }
-  }
-  int x_42 = x_42_phi;
-  int x_44 = x_5.x_GLF_uniform_int_values[2].el;
-  if ((x_42 == x_44)) {
-    int x_50 = x_5.x_GLF_uniform_int_values[0].el;
-    float x_51 = float(x_50);
-    int x_53 = x_5.x_GLF_uniform_int_values[1].el;
-    float x_54 = float(x_53);
-    x_GLF_color = vec4(x_51, x_54, x_54, x_51);
-  } else {
-    int x_57 = x_5.x_GLF_uniform_int_values[1].el;
-    float x_58 = float(x_57);
-    x_GLF_color = vec4(x_58, x_58, x_58, x_58);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol() {
-  main_1();
-  main_out tint_symbol_1 = main_out(x_GLF_color);
-  return tint_symbol_1;
-}
-
-void main() {
-  main_out inner_result = tint_symbol();
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<i32, 4>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_5 : buf0;
 
@@ -15,7 +20,7 @@ fn main_1() {
   var x_31_phi : i32;
   var x_42_phi : i32;
   let x_24 : i32 = min(1, reverseBits(1));
-  let x_26 : i32 = x_5.x_GLF_uniform_int_values[3];
+  let x_26 : i32 = x_5.x_GLF_uniform_int_values[3].el;
   x_28_phi = x_26;
   x_31_phi = 1;
   loop {
@@ -28,7 +33,7 @@ fn main_1() {
       break;
     }
     x_29 = bitcast<i32>((x_28 + bitcast<i32>(x_31)));
-    let x_38 : i32 = x_5.x_GLF_uniform_int_values[0];
+    let x_38 : i32 = x_5.x_GLF_uniform_int_values[0].el;
     if ((x_38 == 1)) {
       x_42_phi = x_29;
       break;
@@ -41,15 +46,15 @@ fn main_1() {
     }
   }
   let x_42 : i32 = x_42_phi;
-  let x_44 : i32 = x_5.x_GLF_uniform_int_values[2];
+  let x_44 : i32 = x_5.x_GLF_uniform_int_values[2].el;
   if ((x_42 == x_44)) {
-    let x_50 : i32 = x_5.x_GLF_uniform_int_values[0];
+    let x_50 : i32 = x_5.x_GLF_uniform_int_values[0].el;
     let x_51 : f32 = f32(x_50);
-    let x_53 : i32 = x_5.x_GLF_uniform_int_values[1];
+    let x_53 : i32 = x_5.x_GLF_uniform_int_values[1].el;
     let x_54 : f32 = f32(x_53);
     x_GLF_color = vec4<f32>(x_51, x_54, x_54, x_51);
   } else {
-    let x_57 : i32 = x_5.x_GLF_uniform_int_values[1];
+    let x_57 : i32 = x_5.x_GLF_uniform_int_values[1].el;
     let x_58 : f32 = f32(x_57);
     x_GLF_color = vec4<f32>(x_58, x_58, x_58, x_58);
   }
@@ -59,7 +64,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl.expected.glsl

@@ -1,83 +0,0 @@
-vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr = @stride(16) array<i32, 4>;
-            ^^^^^^
-
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct tint_padded_array_element {
-  int el;
-};
-
-struct buf0 {
-  tint_padded_array_element x_GLF_uniform_int_values[4];
-};
-
-layout(binding = 0) uniform buf0_1 {
-  tint_padded_array_element x_GLF_uniform_int_values[4];
-} x_5;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-void main_1() {
-  int x_28 = 0;
-  int x_29 = 0;
-  int x_28_phi = 0;
-  int x_31_phi = 0;
-  int x_42_phi = 0;
-  int x_24 = min(1, bitfieldReverse(1));
-  int x_26 = x_5.x_GLF_uniform_int_values[3].el;
-  x_28_phi = x_26;
-  x_31_phi = 1;
-  while (true) {
-    int x_32 = 0;
-    x_28 = x_28_phi;
-    int x_31 = x_31_phi;
-    x_42_phi = x_28;
-    if ((x_31 <= (x_24 - 1))) {
-    } else {
-      break;
-    }
-    x_29 = (x_28 + x_31);
-    int x_38 = x_5.x_GLF_uniform_int_values[0].el;
-    if ((x_38 == 1)) {
-      x_42_phi = x_29;
-      break;
-    }
-    {
-      x_32 = (x_31 + 1);
-      x_28_phi = x_29;
-      x_31_phi = x_32;
-    }
-  }
-  int x_42 = x_42_phi;
-  int x_44 = x_5.x_GLF_uniform_int_values[2].el;
-  if ((x_42 == x_44)) {
-    int x_50 = x_5.x_GLF_uniform_int_values[0].el;
-    float x_51 = float(x_50);
-    int x_53 = x_5.x_GLF_uniform_int_values[1].el;
-    float x_54 = float(x_53);
-    x_GLF_color = vec4(x_51, x_54, x_54, x_51);
-  } else {
-    int x_57 = x_5.x_GLF_uniform_int_values[1].el;
-    float x_58 = float(x_57);
-    x_GLF_color = vec4(x_58, x_58, x_58, x_58);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol() {
-  main_1();
-  main_out tint_symbol_1 = main_out(x_GLF_color);
-  return tint_symbol_1;
-}
-
-void main() {
-  main_out inner_result = tint_symbol();
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-bitwise-inverse-uniform-condition/0-opt.wgsl

@@ -1,18 +1,28 @@
 struct buf2 {
   zero : f32;
-};
+}
 
-type Arr = @stride(16) array<f32, 1>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 2>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 @group(0) @binding(2) var<uniform> x_6 : buf2;
 
@@ -26,26 +36,26 @@ fn main_1() {
   var a : i32;
   var x_32 : i32;
   let x_34 : f32 = x_6.zero;
-  let x_36 : f32 = x_8.x_GLF_uniform_float_values[0];
+  let x_36 : f32 = x_8.x_GLF_uniform_float_values[0].el;
   if ((x_34 < x_36)) {
-    let x_42 : i32 = x_10.x_GLF_uniform_int_values[1];
+    let x_42 : i32 = x_10.x_GLF_uniform_int_values[1].el;
     x_32 = x_42;
   } else {
-    let x_44 : i32 = x_10.x_GLF_uniform_int_values[0];
+    let x_44 : i32 = x_10.x_GLF_uniform_int_values[0].el;
     x_32 = x_44;
   }
   let x_45 : i32 = x_32;
   a = ~((x_45 | 1));
   let x_48 : i32 = a;
-  let x_50 : i32 = x_10.x_GLF_uniform_int_values[0];
+  let x_50 : i32 = x_10.x_GLF_uniform_int_values[0].el;
   if ((x_48 == ~(x_50))) {
-    let x_57 : i32 = x_10.x_GLF_uniform_int_values[0];
+    let x_57 : i32 = x_10.x_GLF_uniform_int_values[0].el;
-    let x_60 : i32 = x_10.x_GLF_uniform_int_values[1];
+    let x_60 : i32 = x_10.x_GLF_uniform_int_values[1].el;
-    let x_63 : i32 = x_10.x_GLF_uniform_int_values[1];
+    let x_63 : i32 = x_10.x_GLF_uniform_int_values[1].el;
-    let x_66 : i32 = x_10.x_GLF_uniform_int_values[0];
+    let x_66 : i32 = x_10.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_57), f32(x_60), f32(x_63), f32(x_66));
   } else {
-    let x_70 : i32 = x_10.x_GLF_uniform_int_values[1];
+    let x_70 : i32 = x_10.x_GLF_uniform_int_values[1].el;
     let x_71 : f32 = f32(x_70);
     x_GLF_color = vec4<f32>(x_71, x_71, x_71, x_71);
   }
@@ -55,7 +65,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-blockfrequency-several-for-loops/0-opt.wgsl

@@ -151,7 +151,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-branch-probability-identity-matrix/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 4>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 3>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_6 : buf1;
 
@@ -17,7 +27,7 @@ struct buf0 {
 var<private> x_GLF_color : vec4<f32>;
 
 fn main_1() {
-  var sums : array<f32, 2>;
+  var sums : array<f32, 2u>;
   var a : i32;
   var b : i32;
   var c : i32;
@@ -26,31 +36,31 @@ fn main_1() {
   var indexable_1 : mat2x2<f32>;
   var x_158 : bool;
   var x_159_phi : bool;
-  let x_16 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_16 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-  let x_85 : f32 = x_8.x_GLF_uniform_float_values[0];
+  let x_85 : f32 = x_8.x_GLF_uniform_float_values[0].el;
   sums[x_16] = -(x_85);
-  let x_18 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_18 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-  let x_90 : f32 = x_8.x_GLF_uniform_float_values[0];
+  let x_90 : f32 = x_8.x_GLF_uniform_float_values[0].el;
   sums[x_18] = -(x_90);
-  let x_19 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_19 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   a = x_19;
   loop {
     let x_20 : i32 = a;
-    let x_21 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_21 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     if ((x_20 < x_21)) {
     } else {
       break;
     }
-    let x_22 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_22 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     b = x_22;
     loop {
       let x_23 : i32 = b;
-      let x_24 : i32 = x_6.x_GLF_uniform_int_values[3];
+      let x_24 : i32 = x_6.x_GLF_uniform_int_values[3].el;
       if ((x_23 < x_24)) {
       } else {
         break;
       }
-      let x_25 : i32 = x_6.x_GLF_uniform_int_values[1];
+      let x_25 : i32 = x_6.x_GLF_uniform_int_values[1].el;
       c = x_25;
       loop {
         let x_26 : i32 = c;
@@ -59,28 +69,28 @@ fn main_1() {
         } else {
           break;
         }
-        let x_28 : i32 = x_6.x_GLF_uniform_int_values[1];
+        let x_28 : i32 = x_6.x_GLF_uniform_int_values[1].el;
         d = x_28;
         loop {
           let x_29 : i32 = d;
-          let x_30 : i32 = x_6.x_GLF_uniform_int_values[3];
+          let x_30 : i32 = x_6.x_GLF_uniform_int_values[3].el;
           if ((x_29 < x_30)) {
           } else {
             break;
           }
           let x_31 : i32 = a;
-          let x_32 : i32 = x_6.x_GLF_uniform_int_values[2];
+          let x_32 : i32 = x_6.x_GLF_uniform_int_values[2].el;
           let x_125 : f32 = f32(x_32);
           let x_33 : i32 = c;
-          let x_34 : i32 = x_6.x_GLF_uniform_int_values[2];
+          let x_34 : i32 = x_6.x_GLF_uniform_int_values[2].el;
           indexable = mat2x2<f32>(vec2<f32>(x_125, 0.0), vec2<f32>(0.0, x_125));
           let x_131 : f32 = indexable[x_33][x_34];
           sums[x_31] = x_131;
           let x_35 : i32 = a;
-          let x_36 : i32 = x_6.x_GLF_uniform_int_values[2];
+          let x_36 : i32 = x_6.x_GLF_uniform_int_values[2].el;
           let x_134 : f32 = f32(x_36);
           let x_37 : i32 = c;
-          let x_38 : i32 = x_6.x_GLF_uniform_int_values[2];
+          let x_38 : i32 = x_6.x_GLF_uniform_int_values[2].el;
           indexable_1 = mat2x2<f32>(vec2<f32>(x_134, 0.0), vec2<f32>(0.0, x_134));
           let x_140 : f32 = indexable_1[x_37][x_38];
           let x_142 : f32 = sums[x_35];
@@ -109,27 +119,27 @@ fn main_1() {
       a = (x_45 + 1);
     }
   }
-  let x_47 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_47 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   let x_147 : f32 = sums[x_47];
-  let x_149 : f32 = x_8.x_GLF_uniform_float_values[1];
+  let x_149 : f32 = x_8.x_GLF_uniform_float_values[1].el;
   let x_150 : bool = (x_147 == x_149);
   x_159_phi = x_150;
   if (x_150) {
-    let x_48 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_48 : i32 = x_6.x_GLF_uniform_int_values[2].el;
     let x_155 : f32 = sums[x_48];
-    let x_157 : f32 = x_8.x_GLF_uniform_float_values[2];
+    let x_157 : f32 = x_8.x_GLF_uniform_float_values[2].el;
     x_158 = (x_155 == x_157);
     x_159_phi = x_158;
   }
   let x_159 : bool = x_159_phi;
   if (x_159) {
-    let x_49 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_49 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-    let x_50 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_50 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_51 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_51 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_52 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_52 : i32 = x_6.x_GLF_uniform_int_values[2].el;
     x_GLF_color = vec4<f32>(f32(x_49), f32(x_50), f32(x_51), f32(x_52));
   } else {
-    let x_53 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_53 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     let x_173 : f32 = f32(x_53);
     x_GLF_color = vec4<f32>(x_173, x_173, x_173, x_173);
   }
@@ -139,7 +149,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-cast-float-to-int-and-back/0-opt.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<i32, 2>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 var<private> x_GLF_color : vec4<f32>;
 
@@ -13,13 +18,13 @@ fn main_1() {
   f = 142.699996948;
   let x_25 : f32 = f;
   if ((f32(i32(x_25)) > 100.0)) {
-    let x_33 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_33 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_36 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_36 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_39 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_39 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_42 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_42 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     x_GLF_color = vec4<f32>(f32(x_33), f32(x_36), f32(x_39), f32(x_42));
   } else {
-    let x_46 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_46 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     let x_47 : f32 = f32(x_46);
     x_GLF_color = vec4<f32>(x_47, x_47, x_47, x_47);
   }
@@ -29,7 +34,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-loop-limit-increment-float-array/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<f32, 2>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 3>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -17,26 +27,26 @@ struct buf1 {
 var<private> x_GLF_color : vec4<f32>;
 
 fn main_1() {
-  var sums : array<f32, 3>;
+  var sums : array<f32, 3u>;
   var i : i32;
   var indexable : mat2x4<f32>;
-  let x_40 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_40 : f32 = x_6.x_GLF_uniform_float_values[0].el;
-  let x_42 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_42 : f32 = x_6.x_GLF_uniform_float_values[0].el;
-  let x_44 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_44 : f32 = x_6.x_GLF_uniform_float_values[0].el;
-  sums = array<f32, 3>(x_40, x_42, x_44);
+  sums = array<f32, 3u>(x_40, x_42, x_44);
   i = 0;
   loop {
     let x_50 : i32 = i;
-    let x_52 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_52 : i32 = x_9.x_GLF_uniform_int_values[0].el;
-    let x_54 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_54 : i32 = x_9.x_GLF_uniform_int_values[0].el;
     if ((x_50 < clamp(x_52, x_54, 2))) {
     } else {
       break;
     }
-    let x_59 : i32 = x_9.x_GLF_uniform_int_values[2];
+    let x_59 : i32 = x_9.x_GLF_uniform_int_values[2].el;
-    let x_61 : f32 = x_6.x_GLF_uniform_float_values[0];
+    let x_61 : f32 = x_6.x_GLF_uniform_float_values[0].el;
     let x_65 : i32 = i;
-    let x_67 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_67 : i32 = x_9.x_GLF_uniform_int_values[1].el;
     indexable = mat2x4<f32>(vec4<f32>(x_61, 0.0, 0.0, 0.0), vec4<f32>(0.0, x_61, 0.0, 0.0));
     let x_69 : f32 = indexable[x_65][x_67];
     let x_71 : f32 = sums[x_59];
@@ -47,17 +57,17 @@ fn main_1() {
       i = (x_74 + 1);
     }
   }
-  let x_77 : i32 = x_9.x_GLF_uniform_int_values[2];
+  let x_77 : i32 = x_9.x_GLF_uniform_int_values[2].el;
   let x_79 : f32 = sums[x_77];
-  let x_81 : f32 = x_6.x_GLF_uniform_float_values[1];
+  let x_81 : f32 = x_6.x_GLF_uniform_float_values[1].el;
   if ((x_79 == x_81)) {
-    let x_87 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_87 : i32 = x_9.x_GLF_uniform_int_values[0].el;
-    let x_90 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_90 : i32 = x_9.x_GLF_uniform_int_values[1].el;
-    let x_93 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_93 : i32 = x_9.x_GLF_uniform_int_values[1].el;
-    let x_96 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_96 : i32 = x_9.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_87), f32(x_90), f32(x_93), f32(x_96));
   } else {
-    let x_100 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_100 : i32 = x_9.x_GLF_uniform_int_values[1].el;
     let x_101 : f32 = f32(x_100);
     x_GLF_color = vec4<f32>(x_101, x_101, x_101, x_101);
   }
@@ -67,7 +77,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-lower-limit-from-always-false/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<f32, 2>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 2>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_7 : buf1;
 
@@ -20,20 +30,20 @@ fn main_1() {
   var a : f32;
   var b : f32;
   a = 1.0;
-  let x_33 : f32 = x_7.x_GLF_uniform_float_values[1];
+  let x_33 : f32 = x_7.x_GLF_uniform_float_values[1].el;
   let x_34 : f32 = a;
   b = clamp(x_33, select(0.0, x_34, false), 1.0);
   let x_37 : f32 = b;
-  let x_39 : f32 = x_7.x_GLF_uniform_float_values[1];
+  let x_39 : f32 = x_7.x_GLF_uniform_float_values[1].el;
   if ((x_37 == x_39)) {
     let x_44 : f32 = b;
-    let x_46 : f32 = x_7.x_GLF_uniform_float_values[0];
+    let x_46 : f32 = x_7.x_GLF_uniform_float_values[0].el;
-    let x_49 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_49 : i32 = x_9.x_GLF_uniform_int_values[0].el;
-    let x_52 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_52 : i32 = x_9.x_GLF_uniform_int_values[0].el;
-    let x_55 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_55 : i32 = x_9.x_GLF_uniform_int_values[1].el;
     x_GLF_color = vec4<f32>((x_44 * x_46), f32(x_49), f32(x_52), f32(x_55));
   } else {
-    let x_59 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_59 : i32 = x_9.x_GLF_uniform_int_values[0].el;
     let x_60 : f32 = f32(x_59);
     x_GLF_color = vec4<f32>(x_60, x_60, x_60, x_60);
   }
@@ -43,7 +53,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-component-condition-using-matrix/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 5>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 5u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 2>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_6 : buf1;
 
@@ -19,16 +29,16 @@ var<private> x_GLF_color : vec4<f32>;
 fn main_1() {
   var v : vec4<f32>;
   var i : i32;
-  let x_40 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_40 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-  let x_43 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_43 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-  let x_46 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_46 : i32 = x_6.x_GLF_uniform_int_values[3].el;
-  let x_49 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_49 : i32 = x_6.x_GLF_uniform_int_values[0].el;
   v = vec4<f32>(f32(x_40), f32(x_43), f32(x_46), f32(x_49));
-  let x_53 : i32 = x_6.x_GLF_uniform_int_values[4];
+  let x_53 : i32 = x_6.x_GLF_uniform_int_values[4].el;
   i = x_53;
   loop {
     let x_58 : i32 = i;
-    let x_60 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_60 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     if ((x_58 < x_60)) {
     } else {
       break;
@@ -38,13 +48,13 @@ fn main_1() {
     let x_65 : vec4<f32> = v;
     let x_66 : vec4<f32> = v;
     let x_88 : i32 = i;
-    let x_92 : f32 = x_9.x_GLF_uniform_float_values[0];
+    let x_92 : f32 = x_9.x_GLF_uniform_float_values[0].el;
     if ((mat4x4<f32>(vec4<f32>(x_63.x, x_63.y, x_63.z, x_63.w), vec4<f32>(x_64.x, x_64.y, x_64.z, x_64.w), vec4<f32>(x_65.x, x_65.y, x_65.z, x_65.w), vec4<f32>(x_66.x, x_66.y, x_66.z, x_66.w))[0u][x_88] > x_92)) {
       let x_96 : i32 = i;
       let x_97 : vec4<f32> = v;
-      let x_99 : f32 = x_9.x_GLF_uniform_float_values[1];
+      let x_99 : f32 = x_9.x_GLF_uniform_float_values[1].el;
-      let x_102 : f32 = x_9.x_GLF_uniform_float_values[0];
+      let x_102 : f32 = x_9.x_GLF_uniform_float_values[0].el;
-      let x_106 : i32 = x_6.x_GLF_uniform_int_values[1];
+      let x_106 : i32 = x_6.x_GLF_uniform_int_values[1].el;
       v[x_96] = clamp(x_97, vec4<f32>(x_99, x_99, x_99, x_99), vec4<f32>(x_102, x_102, x_102, x_102))[x_106];
     }
 
@@ -54,16 +64,16 @@ fn main_1() {
     }
   }
   let x_111 : vec4<f32> = v;
-  let x_113 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_113 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   let x_114 : f32 = f32(x_113);
   if (all((x_111 == vec4<f32>(x_114, x_114, x_114, x_114)))) {
-    let x_122 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_122 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_125 : i32 = x_6.x_GLF_uniform_int_values[4];
+    let x_125 : i32 = x_6.x_GLF_uniform_int_values[4].el;
-    let x_128 : i32 = x_6.x_GLF_uniform_int_values[4];
+    let x_128 : i32 = x_6.x_GLF_uniform_int_values[4].el;
-    let x_131 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_131 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     x_GLF_color = vec4<f32>(f32(x_122), f32(x_125), f32(x_128), f32(x_131));
   } else {
-    let x_135 : i32 = x_6.x_GLF_uniform_int_values[4];
+    let x_135 : i32 = x_6.x_GLF_uniform_int_values[4].el;
     let x_136 : f32 = f32(x_135);
     x_GLF_color = vec4<f32>(x_136, x_136, x_136, x_136);
   }
@@ -73,7 +83,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-element-ceil-negative/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<f32, 2>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 2>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_6 : buf1;
 
@@ -19,22 +29,22 @@ var<private> x_GLF_color : vec4<f32>;
 fn main_1() {
   var v0 : vec2<f32>;
   var v1 : vec2<f32>;
-  let x_36 : f32 = x_6.x_GLF_uniform_float_values[1];
+  let x_36 : f32 = x_6.x_GLF_uniform_float_values[1].el;
   v0 = vec2<f32>(x_36, -580.015014648);
   let x_38 : vec2<f32> = v0;
-  let x_41 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_41 : f32 = x_6.x_GLF_uniform_float_values[0].el;
   let x_42 : f32 = -(x_41);
   v1 = clamp(ceil(x_38), vec2<f32>(x_42, x_42), vec2<f32>(100.0, 100.0));
   let x_46 : f32 = v1.y;
-  let x_48 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_48 : f32 = x_6.x_GLF_uniform_float_values[0].el;
   if ((x_46 == -(x_48))) {
-    let x_55 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_55 : i32 = x_9.x_GLF_uniform_int_values[0].el;
-    let x_58 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_58 : i32 = x_9.x_GLF_uniform_int_values[1].el;
-    let x_61 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_61 : i32 = x_9.x_GLF_uniform_int_values[1].el;
-    let x_64 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_64 : i32 = x_9.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_55), f32(x_58), f32(x_61), f32(x_64));
   } else {
-    let x_68 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_68 : i32 = x_9.x_GLF_uniform_int_values[1].el;
     let x_69 : f32 = f32(x_68);
     x_GLF_color = vec4<f32>(x_69, x_69, x_69, x_69);
   }
@@ -44,7 +54,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-clamp-vector-variable-negative-offset/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<f32, 3>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 2>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_6 : buf1;
 
@@ -19,22 +29,22 @@ var<private> x_GLF_color : vec4<f32>;
 fn main_1() {
   var v0 : vec2<f32>;
   var v1 : vec2<f32>;
-  let x_37 : f32 = x_6.x_GLF_uniform_float_values[2];
+  let x_37 : f32 = x_6.x_GLF_uniform_float_values[2].el;
   v0 = vec2<f32>(x_37, 3.799999952);
   let x_39 : vec2<f32> = v0;
-  let x_43 : f32 = x_6.x_GLF_uniform_float_values[1];
+  let x_43 : f32 = x_6.x_GLF_uniform_float_values[1].el;
   v1 = clamp((x_39 - vec2<f32>(1.0, 1.0)), vec2<f32>(0.0, 0.0), vec2<f32>(x_43, x_43));
   let x_47 : vec2<f32> = v1;
-  let x_49 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_49 : f32 = x_6.x_GLF_uniform_float_values[0].el;
-  let x_51 : f32 = x_6.x_GLF_uniform_float_values[1];
+  let x_51 : f32 = x_6.x_GLF_uniform_float_values[1].el;
   if (all((x_47 == vec2<f32>(x_49, x_51)))) {
-    let x_59 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_59 : i32 = x_9.x_GLF_uniform_int_values[0].el;
-    let x_62 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_62 : i32 = x_9.x_GLF_uniform_int_values[1].el;
-    let x_65 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_65 : i32 = x_9.x_GLF_uniform_int_values[1].el;
-    let x_68 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_68 : i32 = x_9.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_59), f32(x_62), f32(x_65), f32(x_68));
   } else {
-    let x_72 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_72 : i32 = x_9.x_GLF_uniform_int_values[1].el;
     let x_73 : f32 = f32(x_72);
     x_GLF_color = vec4<f32>(x_73, x_73, x_73, x_73);
   }
@@ -44,7 +54,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-clear-yz-inside-condition/0-opt.wgsl

@@ -1,12 +1,17 @@
-type Arr = @stride(16) array<f32, 2>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
 struct buf1 {
   zero : f32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -18,20 +23,20 @@ fn main_1() {
   var v0 : vec2<f32>;
   var v1 : vec4<f32>;
   var x_57 : vec4<f32>;
-  let x_32 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_32 : f32 = x_6.x_GLF_uniform_float_values[0].el;
   v0 = vec2<f32>(x_32, x_32);
   let x_35 : f32 = v0.x;
   let x_36 : vec4<f32> = vec4<f32>(x_35, x_35, x_35, x_35);
   v1 = x_36;
   let x_38 : f32 = x_9.zero;
-  let x_40 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_40 : f32 = x_6.x_GLF_uniform_float_values[0].el;
   if (!((x_38 == x_40))) {
     let x_46 : f32 = x_9.zero;
-    let x_48 : f32 = x_6.x_GLF_uniform_float_values[1];
+    let x_48 : f32 = x_6.x_GLF_uniform_float_values[1].el;
     if ((x_46 == x_48)) {
       return;
     }
-    let x_53 : f32 = x_6.x_GLF_uniform_float_values[0];
+    let x_53 : f32 = x_6.x_GLF_uniform_float_values[0].el;
     let x_56 : vec2<f32> = (vec2<f32>(x_36.y, x_36.z) - vec2<f32>(x_53, x_53));
     x_57 = vec4<f32>(x_36.x, x_56.x, x_56.y, x_36.w);
     v1 = x_57;
@@ -45,7 +50,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl

@@ -1,141 +0,0 @@
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct strided_arr {
-  float el;
-};
-
-struct buf1 {
-  strided_arr x_GLF_uniform_float_values[3];
-};
-
-struct strided_arr_1 {
-  int el;
-};
-
-struct buf2 {
-  strided_arr_1 x_GLF_uniform_int_values[4];
-};
-
-struct buf3 {
-  int three;
-};
-
-struct strided_arr_2 {
-  uint el;
-};
-
-struct buf0 {
-  strided_arr_2 x_GLF_uniform_uint_values[1];
-};
-
-vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-layout(binding = 1) uniform buf1_1 {
-  strided_arr x_GLF_uniform_float_values[3];
-} x_8;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-layout(binding = 2) uniform buf2_1 {
-  strided_arr_1 x_GLF_uniform_int_values[4];
-} x_12;
-
-layout(binding = 3) uniform buf3_1 {
-  int three;
-} x_14;
-
-layout(binding = 0) uniform buf0_1 {
-  strided_arr_2 x_GLF_uniform_uint_values[1];
-} x_16;
-
-void func0_() {
-  vec4 tmp = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-  float x_112 = tint_symbol.x;
-  float x_114 = x_8.x_GLF_uniform_float_values[1].el;
-  if ((x_112 > x_114)) {
-    tmp = x_GLF_color;
-  }
-  x_GLF_color = tmp;
-  return;
-}
-
-int func1_() {
-  int a = 0;
-  int x_122 = x_12.x_GLF_uniform_int_values[1].el;
-  a = x_122;
-  while (true) {
-    int x_127 = a;
-    int x_129 = x_12.x_GLF_uniform_int_values[3].el;
-    if ((x_127 < x_129)) {
-    } else {
-      break;
-    }
-    int x_133 = x_14.three;
-    int x_135 = x_12.x_GLF_uniform_int_values[1].el;
-    if ((x_133 > x_135)) {
-      func0_();
-      int x_142 = x_12.x_GLF_uniform_int_values[3].el;
-      a = x_142;
-    } else {
-      func0_();
-    }
-  }
-  return a;
-}
-
-void main_1() {
-  int a_1 = 0;
-  int i = 0;
-  int j = 0;
-  float x_56 = tint_symbol.x;
-  float x_58 = x_8.x_GLF_uniform_float_values[1].el;
-  if ((x_56 > x_58)) {
-    float x_64 = x_8.x_GLF_uniform_float_values[0].el;
-    float x_66 = x_8.x_GLF_uniform_float_values[1].el;
-    float x_68 = x_8.x_GLF_uniform_float_values[0].el;
-    float x_70 = x_8.x_GLF_uniform_float_values[2].el;
-    x_GLF_color = vec4(x_64, x_66, x_68, x_70);
-  } else {
-    uint x_73 = x_16.x_GLF_uniform_uint_values[0].el;
-    x_GLF_color = unpackSnorm4x8(x_73);
-  }
-  int x_76 = x_12.x_GLF_uniform_int_values[2].el;
-  a_1 = x_76;
-  i = 0;
-  {
-    for(; (i < 5); i = (i + 1)) {
-      j = 0;
-      {
-        for(; (j < 2); j = (j + 1)) {
-          int x_91 = func1_();
-          a_1 = (a_1 + x_91);
-        }
-      }
-    }
-  }
-  int x_98 = a_1;
-  int x_100 = x_12.x_GLF_uniform_int_values[0].el;
-  if ((x_98 == x_100)) {
-    float x_105 = x_8.x_GLF_uniform_float_values[0].el;
-    float x_107 = x_GLF_color.z;
-    x_GLF_color.z = (x_107 - x_105);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol_1(vec4 tint_symbol_2) {
-  tint_symbol = tint_symbol_2;
-  main_1();
-  main_out tint_symbol_3 = main_out(x_GLF_color);
-  return tint_symbol_3;
-}
-
-void main() {
-  main_out inner_result = tint_symbol_1(gl_FragCoord);
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl

@@ -1,24 +1,39 @@
-type Arr = @stride(16) array<f32, 3>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 4>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 4u>;
 
 struct buf2 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 struct buf3 {
   three : i32;
-};
+}
 
-type Arr_2 = @stride(16) array<u32, 1>;
+struct strided_arr_2 {
+  @size(16)
+  el : u32;
+}
+
+type Arr_2 = array<strided_arr_2, 1u>;
 
 struct buf0 {
   x_GLF_uniform_uint_values : Arr_2;
-};
+}
 
 var<private> gl_FragCoord : vec4<f32>;
 
@@ -35,7 +50,7 @@ var<private> x_GLF_color : vec4<f32>;
 fn func0_() {
   var tmp : vec4<f32>;
   let x_112 : f32 = gl_FragCoord.x;
-  let x_114 : f32 = x_8.x_GLF_uniform_float_values[1];
+  let x_114 : f32 = x_8.x_GLF_uniform_float_values[1].el;
   if ((x_112 > x_114)) {
     let x_118 : vec4<f32> = x_GLF_color;
     tmp = x_118;
@@ -47,20 +62,20 @@ fn func0_() {
 
 fn func1_() -> i32 {
   var a : i32;
-  let x_122 : i32 = x_12.x_GLF_uniform_int_values[1];
+  let x_122 : i32 = x_12.x_GLF_uniform_int_values[1].el;
   a = x_122;
   loop {
     let x_127 : i32 = a;
-    let x_129 : i32 = x_12.x_GLF_uniform_int_values[3];
+    let x_129 : i32 = x_12.x_GLF_uniform_int_values[3].el;
     if ((x_127 < x_129)) {
     } else {
       break;
     }
     let x_133 : i32 = x_14.three;
-    let x_135 : i32 = x_12.x_GLF_uniform_int_values[1];
+    let x_135 : i32 = x_12.x_GLF_uniform_int_values[1].el;
     if ((x_133 > x_135)) {
       func0_();
-      let x_142 : i32 = x_12.x_GLF_uniform_int_values[3];
+      let x_142 : i32 = x_12.x_GLF_uniform_int_values[3].el;
       a = x_142;
     } else {
       func0_();
@@ -75,18 +90,18 @@ fn main_1() {
   var i : i32;
   var j : i32;
   let x_56 : f32 = gl_FragCoord.x;
-  let x_58 : f32 = x_8.x_GLF_uniform_float_values[1];
+  let x_58 : f32 = x_8.x_GLF_uniform_float_values[1].el;
   if ((x_56 > x_58)) {
-    let x_64 : f32 = x_8.x_GLF_uniform_float_values[0];
+    let x_64 : f32 = x_8.x_GLF_uniform_float_values[0].el;
-    let x_66 : f32 = x_8.x_GLF_uniform_float_values[1];
+    let x_66 : f32 = x_8.x_GLF_uniform_float_values[1].el;
-    let x_68 : f32 = x_8.x_GLF_uniform_float_values[0];
+    let x_68 : f32 = x_8.x_GLF_uniform_float_values[0].el;
-    let x_70 : f32 = x_8.x_GLF_uniform_float_values[2];
+    let x_70 : f32 = x_8.x_GLF_uniform_float_values[2].el;
     x_GLF_color = vec4<f32>(x_64, x_66, x_68, x_70);
   } else {
-    let x_73 : u32 = x_16.x_GLF_uniform_uint_values[0];
+    let x_73 : u32 = x_16.x_GLF_uniform_uint_values[0].el;
     x_GLF_color = unpack4x8snorm(x_73);
   }
-  let x_76 : i32 = x_12.x_GLF_uniform_int_values[2];
+  let x_76 : i32 = x_12.x_GLF_uniform_int_values[2].el;
   a_1 = x_76;
   i = 0;
   loop {
@@ -118,9 +133,9 @@ fn main_1() {
     }
   }
   let x_98 : i32 = a_1;
-  let x_100 : i32 = x_12.x_GLF_uniform_int_values[0];
+  let x_100 : i32 = x_12.x_GLF_uniform_int_values[0].el;
   if ((x_98 == x_100)) {
-    let x_105 : f32 = x_8.x_GLF_uniform_float_values[0];
+    let x_105 : f32 = x_8.x_GLF_uniform_float_values[0].el;
     let x_107 : f32 = x_GLF_color.z;
     x_GLF_color.z = (x_107 - x_105);
   }
@@ -130,7 +145,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl.expected.glsl

@@ -1,153 +0,0 @@
-vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr = @stride(16) array<f32, 3>;
-            ^^^^^^
-
-vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr_1 = @stride(16) array<i32, 4>;
-              ^^^^^^
-
-vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl:17:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr_2 = @stride(16) array<u32, 1>;
-              ^^^^^^
-
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct tint_padded_array_element {
-  float el;
-};
-
-struct buf1 {
-  tint_padded_array_element x_GLF_uniform_float_values[3];
-};
-
-struct tint_padded_array_element_1 {
-  int el;
-};
-
-struct buf2 {
-  tint_padded_array_element_1 x_GLF_uniform_int_values[4];
-};
-
-struct buf3 {
-  int three;
-};
-
-struct tint_padded_array_element_2 {
-  uint el;
-};
-
-struct buf0 {
-  tint_padded_array_element_2 x_GLF_uniform_uint_values[1];
-};
-
-vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-layout(binding = 1) uniform buf1_1 {
-  tint_padded_array_element x_GLF_uniform_float_values[3];
-} x_8;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-layout(binding = 2) uniform buf2_1 {
-  tint_padded_array_element_1 x_GLF_uniform_int_values[4];
-} x_12;
-
-layout(binding = 3) uniform buf3_1 {
-  int three;
-} x_14;
-
-layout(binding = 0) uniform buf0_1 {
-  tint_padded_array_element_2 x_GLF_uniform_uint_values[1];
-} x_16;
-
-void func0_() {
-  vec4 tmp = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-  float x_112 = tint_symbol.x;
-  float x_114 = x_8.x_GLF_uniform_float_values[1].el;
-  if ((x_112 > x_114)) {
-    tmp = x_GLF_color;
-  }
-  x_GLF_color = tmp;
-  return;
-}
-
-int func1_() {
-  int a = 0;
-  int x_122 = x_12.x_GLF_uniform_int_values[1].el;
-  a = x_122;
-  while (true) {
-    int x_127 = a;
-    int x_129 = x_12.x_GLF_uniform_int_values[3].el;
-    if ((x_127 < x_129)) {
-    } else {
-      break;
-    }
-    int x_133 = x_14.three;
-    int x_135 = x_12.x_GLF_uniform_int_values[1].el;
-    if ((x_133 > x_135)) {
-      func0_();
-      int x_142 = x_12.x_GLF_uniform_int_values[3].el;
-      a = x_142;
-    } else {
-      func0_();
-    }
-  }
-  return a;
-}
-
-void main_1() {
-  int a_1 = 0;
-  int i = 0;
-  int j = 0;
-  float x_56 = tint_symbol.x;
-  float x_58 = x_8.x_GLF_uniform_float_values[1].el;
-  if ((x_56 > x_58)) {
-    float x_64 = x_8.x_GLF_uniform_float_values[0].el;
-    float x_66 = x_8.x_GLF_uniform_float_values[1].el;
-    float x_68 = x_8.x_GLF_uniform_float_values[0].el;
-    float x_70 = x_8.x_GLF_uniform_float_values[2].el;
-    x_GLF_color = vec4(x_64, x_66, x_68, x_70);
-  } else {
-    uint x_73 = x_16.x_GLF_uniform_uint_values[0].el;
-    x_GLF_color = unpackSnorm4x8(x_73);
-  }
-  int x_76 = x_12.x_GLF_uniform_int_values[2].el;
-  a_1 = x_76;
-  i = 0;
-  {
-    for(; (i < 5); i = (i + 1)) {
-      j = 0;
-      {
-        for(; (j < 2); j = (j + 1)) {
-          int x_91 = func1_();
-          a_1 = (a_1 + x_91);
-        }
-      }
-    }
-  }
-  int x_98 = a_1;
-  int x_100 = x_12.x_GLF_uniform_int_values[0].el;
-  if ((x_98 == x_100)) {
-    float x_105 = x_8.x_GLF_uniform_float_values[0].el;
-    float x_107 = x_GLF_color.z;
-    x_GLF_color.z = (x_107 - x_105);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol_1(vec4 tint_symbol_2) {
-  tint_symbol = tint_symbol_2;
-  main_1();
-  main_out tint_symbol_3 = main_out(x_GLF_color);
-  return tint_symbol_3;
-}
-
-void main() {
-  main_out inner_result = tint_symbol_1(gl_FragCoord);
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-color-overwrite-identity-matrix-multiply/0.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<f32, 5>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
 var<private> gl_FragCoord : vec4<f32>;
 
@@ -12,19 +17,19 @@ var<private> x_GLF_color : vec4<f32>;
 
 fn main_1() {
   let x_33 : f32 = gl_FragCoord.x;
-  let x_35 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_35 : f32 = x_6.x_GLF_uniform_float_values[0].el;
   if ((x_33 > x_35)) {
-    let x_40 : f32 = x_6.x_GLF_uniform_float_values[2];
+    let x_40 : f32 = x_6.x_GLF_uniform_float_values[2].el;
     x_GLF_color = vec4<f32>(x_40, x_40, x_40, x_40);
     let x_43 : f32 = gl_FragCoord.y;
     if ((x_43 > x_35)) {
-      let x_48 : f32 = x_6.x_GLF_uniform_float_values[4];
+      let x_48 : f32 = x_6.x_GLF_uniform_float_values[4].el;
       x_GLF_color = vec4<f32>(x_48, x_48, x_48, x_48);
     }
-    let x_51 : f32 = x_6.x_GLF_uniform_float_values[3];
+    let x_51 : f32 = x_6.x_GLF_uniform_float_values[3].el;
     x_GLF_color = vec4<f32>(x_51, x_51, x_51, x_51);
   }
-  let x_54 : f32 = x_6.x_GLF_uniform_float_values[1];
+  let x_54 : f32 = x_6.x_GLF_uniform_float_values[1].el;
   x_GLF_color = vec4<f32>(x_35, x_54, x_54, 10.0);
   let x_61 : vec4<f32> = x_GLF_color;
   x_GLF_color = (mat4x4<f32>(vec4<f32>(x_35, 0.0, 0.0, 0.0), vec4<f32>(0.0, x_35, 0.0, 0.0), vec4<f32>(0.0, 0.0, x_35, 0.0), vec4<f32>(0.0, 0.0, 0.0, x_35)) * x_61);
@@ -34,7 +39,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl

@@ -1,12 +1,17 @@
 struct buf1 {
   v1 : vec2<f32>;
-};
+}
 
-type Arr = @stride(16) array<i32, 2>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_6 : buf1;
 
@@ -28,13 +33,13 @@ fn main_1() {
   }
   let x_51 : bool = b;
   if (x_51) {
-    let x_10 : i32 = x_8.x_GLF_uniform_int_values[0];
+    let x_10 : i32 = x_8.x_GLF_uniform_int_values[0].el;
-    let x_11 : i32 = x_8.x_GLF_uniform_int_values[1];
+    let x_11 : i32 = x_8.x_GLF_uniform_int_values[1].el;
-    let x_12 : i32 = x_8.x_GLF_uniform_int_values[1];
+    let x_12 : i32 = x_8.x_GLF_uniform_int_values[1].el;
-    let x_13 : i32 = x_8.x_GLF_uniform_int_values[0];
+    let x_13 : i32 = x_8.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_10), f32(x_11), f32(x_12), f32(x_13));
   } else {
-    let x_14 : i32 = x_8.x_GLF_uniform_int_values[1];
+    let x_14 : i32 = x_8.x_GLF_uniform_int_values[1].el;
     let x_65 : f32 = f32(x_14);
     x_GLF_color = vec4<f32>(x_65, x_65, x_65, x_65);
   }
@@ -44,7 +49,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-condition-loop-index-bitwise-not/0-opt.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<i32, 3>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -11,13 +16,13 @@ var<private> x_GLF_color : vec4<f32>;
 fn main_1() {
   var a : i32;
   var i : i32;
-  let x_26 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_26 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   a = x_26;
-  let x_28 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_28 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   i = x_28;
   loop {
     let x_33 : i32 = i;
-    let x_35 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_35 : i32 = x_6.x_GLF_uniform_int_values[2].el;
     if ((x_33 < x_35)) {
     } else {
       break;
@@ -34,15 +39,15 @@ fn main_1() {
     }
   }
   let x_47 : i32 = a;
-  let x_49 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_49 : i32 = x_6.x_GLF_uniform_int_values[2].el;
   if ((x_47 == x_49)) {
-    let x_55 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_55 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_58 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_58 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_61 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_61 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_64 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_64 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_55), f32(x_58), f32(x_61), f32(x_64));
   } else {
-    let x_68 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_68 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     let x_69 : f32 = f32(x_68);
     x_GLF_color = vec4<f32>(x_69, x_69, x_69, x_69);
   }
@@ -52,7 +57,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl

@@ -1,18 +1,28 @@
-type Arr = @stride(16) array<i32, 3>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 struct buf2 {
   injectionSwitch : vec2<f32>;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 1>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 var<private> x_GLF_color : vec4<f32>;
 
@@ -26,16 +36,16 @@ fn main_1() {
   var a : i32;
   var i : i32;
   a = 1;
-  let x_38 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_38 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_41 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_41 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-  let x_44 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_44 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-  let x_47 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_47 : i32 = x_6.x_GLF_uniform_int_values[0].el;
   x_GLF_color = vec4<f32>(f32(x_38), f32(x_41), f32(x_44), f32(x_47));
-  let x_51 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_51 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   i = x_51;
   loop {
     let x_56 : i32 = i;
-    let x_58 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_58 : i32 = x_6.x_GLF_uniform_int_values[2].el;
     if ((x_56 < x_58)) {
     } else {
       break;
@@ -46,7 +56,7 @@ fn main_1() {
       break;
     }
     let x_67 : f32 = x_9.injectionSwitch.x;
-    let x_69 : f32 = x_11.x_GLF_uniform_float_values[0];
+    let x_69 : f32 = x_11.x_GLF_uniform_float_values[0].el;
     if ((x_67 > x_69)) {
       discard;
     }
@@ -62,7 +72,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-ceil-vec4/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   quarter : f32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -22,7 +22,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-inside-while/0-opt.wgsl

@@ -19,7 +19,7 @@ fn main_1() {
   }
   let x_37 : i32 = i;
   let x_39 : i32 = j;
-  if (((x_37 == 9) && (x_39 == 10))) {
+  if (((x_37 == 9) & (x_39 == 10))) {
     x_GLF_color = vec4<f32>(1.0, 0.0, 0.0, 1.0);
   } else {
     x_GLF_color = vec4<f32>(0.0, 0.0, 0.0, 0.0);
@@ -30,7 +30,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-min/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   zero : f32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_5 : buf0;
 
@@ -20,7 +20,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-vs-original/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   one : f32;
-};
+}
 
 var<private> x_GLF_color : vec4<f32>;
 
@@ -25,7 +25,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   fourtytwo : f32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_5 : buf0;
 
@@ -31,7 +31,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-dot-condition-true/0-opt.wgsl

@@ -15,7 +15,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-gte-const-first/0.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   one : f32;
-};
+}
 
 var<private> gl_FragCoord : vec4<f32>;
 
@@ -22,7 +22,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-min-as-loop-range/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   zero : i32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_8 : buf0;
 
@@ -10,7 +10,7 @@ fn main_1() {
   var highSigned : i32;
   var highUnsigned : u32;
   var i : i32;
-  var data : array<i32, 2>;
+  var data : array<i32, 2u>;
   var i_1 : u32;
   var x_78 : bool;
   var x_79_phi : bool;
@@ -70,7 +70,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl

@@ -1,21 +1,26 @@
-type Arr = @stride(16) array<i32, 2>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 var<private> x_GLF_color : vec4<f32>;
 
 @group(0) @binding(0) var<uniform> x_5 : buf0;
 
 fn main_1() {
-  if (((1.0 % 1.0) <= 0.01)) {
+  if (((1.0 - (1.0 * floor((1.0 / 1.0)))) <= 0.01)) {
-    let x_29 : i32 = x_5.x_GLF_uniform_int_values[0];
+    let x_29 : i32 = x_5.x_GLF_uniform_int_values[0].el;
-    let x_32 : i32 = x_5.x_GLF_uniform_int_values[0];
+    let x_32 : i32 = x_5.x_GLF_uniform_int_values[0].el;
-    let x_35 : i32 = x_5.x_GLF_uniform_int_values[1];
+    let x_35 : i32 = x_5.x_GLF_uniform_int_values[1].el;
     x_GLF_color = vec4<f32>(1.0, f32(x_29), f32(x_32), f32(x_35));
   } else {
-    let x_39 : i32 = x_5.x_GLF_uniform_int_values[0];
+    let x_39 : i32 = x_5.x_GLF_uniform_int_values[0].el;
     let x_40 : f32 = f32(x_39);
     x_GLF_color = vec4<f32>(x_40, x_40, x_40, x_40);
   }
@@ -25,7 +30,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl.expected.glsl

@@ -1,55 +0,0 @@
-vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr = @stride(16) array<i32, 2>;
-            ^^^^^^
-
-#version 310 es
-precision mediump float;
-
-float tint_float_modulo(float lhs, float rhs) {
-  return (lhs - rhs * trunc(lhs / rhs));
-}
-
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct tint_padded_array_element {
-  int el;
-};
-
-struct buf0 {
-  tint_padded_array_element x_GLF_uniform_int_values[2];
-};
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-layout(binding = 0) uniform buf0_1 {
-  tint_padded_array_element x_GLF_uniform_int_values[2];
-} x_5;
-
-void main_1() {
-  if ((tint_float_modulo(1.0f, 1.0f) <= 0.01f)) {
-    int x_29 = x_5.x_GLF_uniform_int_values[0].el;
-    int x_32 = x_5.x_GLF_uniform_int_values[0].el;
-    int x_35 = x_5.x_GLF_uniform_int_values[1].el;
-    x_GLF_color = vec4(1.0f, float(x_29), float(x_32), float(x_35));
-  } else {
-    int x_39 = x_5.x_GLF_uniform_int_values[0].el;
-    float x_40 = float(x_39);
-    x_GLF_color = vec4(x_40, x_40, x_40, x_40);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol() {
-  main_1();
-  main_out tint_symbol_1 = main_out(x_GLF_color);
-  return tint_symbol_1;
-}
-
-void main() {
-  main_out inner_result = tint_symbol();
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-pow-large-exp/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<i32, 2>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<f32, 1>;
+struct strided_arr_1 {
+  @size(16)
+  el : f32;
+}
+
+type Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -21,26 +31,26 @@ fn main_1() {
   var x_48 : bool;
   var x_49_phi : bool;
   f = pow(40.330001831, ldexp(1.0, 98980));
-  let x_35 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_35 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_37 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_37 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_39 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_39 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   let x_41 : bool = (x_35 == (x_37 + x_39));
   x_49_phi = x_41;
   if (!(x_41)) {
     let x_45 : f32 = f;
-    let x_47 : f32 = x_8.x_GLF_uniform_float_values[0];
+    let x_47 : f32 = x_8.x_GLF_uniform_float_values[0].el;
     x_48 = (x_45 > x_47);
     x_49_phi = x_48;
   }
   let x_49 : bool = x_49_phi;
   if (x_49) {
-    let x_54 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_54 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_57 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_57 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_60 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_60 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_63 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_63 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_54), f32(x_57), f32(x_60), f32(x_63));
   } else {
-    let x_67 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_67 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     let x_68 : f32 = f32(x_67);
     x_GLF_color = vec4<f32>(x_68, x_68, x_68, x_68);
   }
@@ -50,7 +60,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-same-condition/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   one : f32;
-};
+}
 
 var<private> x_GLF_color : vec4<f32>;
 
@@ -42,7 +42,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-vector-shuffle/0.wgsl

@@ -6,7 +6,7 @@ fn main_1() {
   var x_26_phi : vec2<f32>;
   var x_5_phi : i32;
   var x_40_phi : bool;
-  x_26_phi = vec2<f32>(0.0, 0.0);
+  x_26_phi = vec2<f32>();
   x_5_phi = 2;
   loop {
     var x_27 : vec2<f32>;
@@ -44,7 +44,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-constant-folding-atan-over-tanh/0-opt.wgsl

@@ -5,7 +5,7 @@ fn main_1() {
   f = atan2(1.0, tanh(1.0));
   let x_21 : f32 = f;
   let x_23 : f32 = f;
-  if (((x_21 > 0.910000026) && (x_23 < 0.930000007))) {
+  if (((x_21 > 0.910000026) & (x_23 < 0.930000007))) {
     x_GLF_color = vec4<f32>(1.0, 0.0, 0.0, 1.0);
   } else {
     x_GLF_color = vec4<f32>(0.0, 0.0, 0.0, 0.0);
@@ -16,7 +16,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-constants-combine-add-sub/0-opt.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<i32, 5>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_8 : buf0;
 
@@ -12,26 +17,26 @@ fn func_f1_(f : ptr<function, f32>) -> i32 {
   var a : i32;
   var b : i32;
   var i : i32;
-  let x_60 : i32 = x_8.x_GLF_uniform_int_values[1];
+  let x_60 : i32 = x_8.x_GLF_uniform_int_values[1].el;
   a = x_60;
-  let x_62 : i32 = x_8.x_GLF_uniform_int_values[2];
+  let x_62 : i32 = x_8.x_GLF_uniform_int_values[2].el;
   b = x_62;
-  let x_64 : i32 = x_8.x_GLF_uniform_int_values[2];
+  let x_64 : i32 = x_8.x_GLF_uniform_int_values[2].el;
   i = x_64;
   loop {
     let x_69 : i32 = i;
-    let x_71 : i32 = x_8.x_GLF_uniform_int_values[4];
+    let x_71 : i32 = x_8.x_GLF_uniform_int_values[4].el;
     if ((x_69 < x_71)) {
     } else {
       break;
     }
     let x_74 : i32 = a;
-    let x_76 : i32 = x_8.x_GLF_uniform_int_values[3];
+    let x_76 : i32 = x_8.x_GLF_uniform_int_values[3].el;
     if ((x_74 > x_76)) {
       break;
     }
     let x_80 : f32 = *(f);
-    let x_83 : i32 = x_8.x_GLF_uniform_int_values[1];
+    let x_83 : i32 = x_8.x_GLF_uniform_int_values[1].el;
     let x_86 : i32 = i;
     a = ((i32(x_80) - (x_83 / 2)) + x_86);
     let x_88 : i32 = b;
@@ -43,30 +48,29 @@ fn func_f1_(f : ptr<function, f32>) -> i32 {
     }
   }
   let x_92 : i32 = b;
-  let x_94 : i32 = x_8.x_GLF_uniform_int_values[0];
+  let x_94 : i32 = x_8.x_GLF_uniform_int_values[0].el;
   if ((x_92 == x_94)) {
-    let x_100 : i32 = x_8.x_GLF_uniform_int_values[1];
+    let x_100 : i32 = x_8.x_GLF_uniform_int_values[1].el;
     return x_100;
   } else {
-    let x_102 : i32 = x_8.x_GLF_uniform_int_values[2];
+    let x_102 : i32 = x_8.x_GLF_uniform_int_values[2].el;
     return x_102;
   }
-  return 0;
 }
 
 fn main_1() {
   var param : f32;
   param = 0.699999988;
   let x_34 : i32 = func_f1_(&(param));
-  let x_36 : i32 = x_8.x_GLF_uniform_int_values[1];
+  let x_36 : i32 = x_8.x_GLF_uniform_int_values[1].el;
   if ((x_34 == x_36)) {
-    let x_42 : i32 = x_8.x_GLF_uniform_int_values[1];
+    let x_42 : i32 = x_8.x_GLF_uniform_int_values[1].el;
-    let x_45 : i32 = x_8.x_GLF_uniform_int_values[2];
+    let x_45 : i32 = x_8.x_GLF_uniform_int_values[2].el;
-    let x_48 : i32 = x_8.x_GLF_uniform_int_values[2];
+    let x_48 : i32 = x_8.x_GLF_uniform_int_values[2].el;
-    let x_51 : i32 = x_8.x_GLF_uniform_int_values[1];
+    let x_51 : i32 = x_8.x_GLF_uniform_int_values[1].el;
     x_GLF_color = vec4<f32>(f32(x_42), f32(x_45), f32(x_48), f32(x_51));
   } else {
-    let x_55 : i32 = x_8.x_GLF_uniform_int_values[2];
+    let x_55 : i32 = x_8.x_GLF_uniform_int_values[2].el;
     let x_56 : f32 = f32(x_55);
     x_GLF_color = vec4<f32>(x_56, x_56, x_56, x_56);
   }
@@ -76,7 +80,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   one : vec2<f32>;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -23,7 +23,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-continue-break-discard-return-in-loop/0-opt.wgsl

@@ -1,12 +1,17 @@
-type Arr = @stride(16) array<i32, 4>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 struct buf1 {
   zero : i32;
-};
+}
 
 var<private> x_GLF_color : vec4<f32>;
 
@@ -15,24 +20,24 @@ var<private> x_GLF_color : vec4<f32>;
 @group(0) @binding(1) var<uniform> x_7 : buf1;
 
 fn main_1() {
-  let x_28 : i32 = x_5.x_GLF_uniform_int_values[0];
+  let x_28 : i32 = x_5.x_GLF_uniform_int_values[0].el;
-  let x_31 : i32 = x_5.x_GLF_uniform_int_values[1];
+  let x_31 : i32 = x_5.x_GLF_uniform_int_values[1].el;
-  let x_34 : i32 = x_5.x_GLF_uniform_int_values[1];
+  let x_34 : i32 = x_5.x_GLF_uniform_int_values[1].el;
-  let x_37 : i32 = x_5.x_GLF_uniform_int_values[0];
+  let x_37 : i32 = x_5.x_GLF_uniform_int_values[0].el;
   x_GLF_color = vec4<f32>(f32(x_28), f32(x_31), f32(x_34), f32(x_37));
   loop {
     let x_45 : i32 = x_7.zero;
-    let x_47 : i32 = x_5.x_GLF_uniform_int_values[0];
+    let x_47 : i32 = x_5.x_GLF_uniform_int_values[0].el;
     if ((x_45 == x_47)) {
       continue;
     }
     let x_52 : i32 = x_7.zero;
-    let x_54 : i32 = x_5.x_GLF_uniform_int_values[2];
+    let x_54 : i32 = x_5.x_GLF_uniform_int_values[2].el;
     if ((x_52 == x_54)) {
       break;
     }
     let x_59 : i32 = x_7.zero;
-    let x_61 : i32 = x_5.x_GLF_uniform_int_values[3];
+    let x_61 : i32 = x_5.x_GLF_uniform_int_values[3].el;
     if ((x_59 == x_61)) {
       discard;
     }
@@ -45,7 +50,7 @@ fn main_1() {
       }
     }
   }
-  let x_66 : i32 = x_5.x_GLF_uniform_int_values[1];
+  let x_66 : i32 = x_5.x_GLF_uniform_int_values[1].el;
   let x_67 : f32 = f32(x_66);
   x_GLF_color = vec4<f32>(x_67, x_67, x_67, x_67);
   return;
@@ -54,7 +59,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-func-argument/0-opt.wgsl

@@ -1,10 +1,10 @@
 struct Array {
-  values : array<i32, 2>;
+  values : array<i32, 2u>;
-};
+}
 
 struct buf0 {
   zero : i32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_8 : buf0;
 
@@ -17,7 +17,7 @@ fn main_1() {
   var param : Array;
   var x_19 : i32;
   var x_20_phi : i32;
-  param = Array(array<i32, 2>(0, 0));
+  param = Array(array<i32, 2u>());
   x_50 = false;
   loop {
     var x_19_phi : i32;
@@ -60,7 +60,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-no-stores/0-opt.wgsl

@@ -1,10 +1,10 @@
 struct Array {
-  values : array<i32, 2>;
+  values : array<i32, 2u>;
-};
+}
 
 struct buf0 {
   zero : i32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_7 : buf0;
 
@@ -32,7 +32,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-param-uniform/0-opt.wgsl

@@ -1,10 +1,10 @@
 struct Array {
-  values : array<i32, 2>;
+  values : array<i32, 2u>;
-};
+}
 
 struct buf0 {
   zero : i32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_8 : buf0;
 
@@ -14,17 +14,17 @@ fn main_1() {
   var x_52 : bool = false;
   var x_17 : i32;
   var x_18 : i32;
-  var x_16 : array<i32, 2>;
+  var x_16 : array<i32, 2u>;
   var param : Array;
   var x_20 : i32;
   var x_21_phi : i32;
   let x_12 : i32 = x_8.zero;
-  let x_22 : array<i32, 2> = x_16;
+  let x_22 : array<i32, 2u> = x_16;
-  var x_23_1 : array<i32, 2> = x_22;
+  var x_23_1 : array<i32, 2u> = x_22;
   x_23_1[0u] = x_12;
-  let x_23 : array<i32, 2> = x_23_1;
+  let x_23 : array<i32, 2u> = x_23_1;
   x_16 = x_23;
-  let x_54 : array<i32, 2> = x_16;
+  let x_54 : array<i32, 2u> = x_16;
   param = Array(x_54);
   x_52 = false;
   loop {
@@ -67,7 +67,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-cosh-clamped-to-one/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<f32, 1>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 1u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 1>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 1u>;
 
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -18,11 +28,11 @@ var<private> x_GLF_color : vec4<f32>;
 
 fn main_1() {
   var v : vec4<f32>;
-  let x_33 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_33 : f32 = x_6.x_GLF_uniform_float_values[0].el;
   v = clamp(cosh(vec4<f32>(1.0, 1.0, 1.0, 1.0)), vec4<f32>(x_33, x_33, x_33, x_33), vec4<f32>(1.0, 1.0, 1.0, 1.0));
   let x_38 : f32 = v.x;
-  let x_40 : i32 = x_8.x_GLF_uniform_int_values[0];
+  let x_40 : i32 = x_8.x_GLF_uniform_int_values[0].el;
-  let x_43 : i32 = x_8.x_GLF_uniform_int_values[0];
+  let x_43 : i32 = x_8.x_GLF_uniform_int_values[0].el;
   let x_46 : f32 = v.z;
   x_GLF_color = vec4<f32>(x_38, f32(x_40), f32(x_43), x_46);
   return;
@@ -31,7 +41,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-cumulate-loops-unreachable/0-opt.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<i32, 5>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 5u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -14,34 +19,34 @@ fn main_1() {
   var i : i32;
   var i_1 : i32;
   var i_2 : i32;
-  var indexable : array<i32, 2>;
+  var indexable : array<i32, 2u>;
-  let x_36 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_36 : i32 = x_6.x_GLF_uniform_int_values[2].el;
   a = x_36;
-  let x_38 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_38 : i32 = x_6.x_GLF_uniform_int_values[3].el;
   b = x_38;
-  let x_40 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_40 : i32 = x_6.x_GLF_uniform_int_values[2].el;
   let x_41 : f32 = f32(x_40);
   x_GLF_color = vec4<f32>(x_41, x_41, x_41, x_41);
-  let x_44 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_44 : i32 = x_6.x_GLF_uniform_int_values[2].el;
   i = x_44;
   loop {
     let x_49 : i32 = i;
-    let x_51 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_51 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     if ((x_49 < x_51)) {
     } else {
       break;
     }
     let x_54 : i32 = i;
-    let x_56 : i32 = x_6.x_GLF_uniform_int_values[3];
+    let x_56 : i32 = x_6.x_GLF_uniform_int_values[3].el;
     if ((x_54 > x_56)) {
       let x_60 : i32 = a;
       a = (x_60 + 1);
       if (false) {
-        let x_65 : i32 = x_6.x_GLF_uniform_int_values[2];
+        let x_65 : i32 = x_6.x_GLF_uniform_int_values[2].el;
         i_1 = x_65;
         loop {
           let x_70 : i32 = i_1;
-          let x_72 : i32 = x_6.x_GLF_uniform_int_values[0];
+          let x_72 : i32 = x_6.x_GLF_uniform_int_values[0].el;
           if ((x_70 < x_72)) {
           } else {
             break;
@@ -56,19 +61,19 @@ fn main_1() {
       i = (x_75 + 1);
     }
   }
-  let x_78 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_78 : i32 = x_6.x_GLF_uniform_int_values[2].el;
   i_2 = x_78;
   loop {
     let x_83 : i32 = i_2;
-    let x_85 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_85 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     if ((x_83 < x_85)) {
     } else {
       break;
     }
-    let x_89 : i32 = x_6.x_GLF_uniform_int_values[3];
+    let x_89 : i32 = x_6.x_GLF_uniform_int_values[3].el;
-    let x_91 : i32 = x_6.x_GLF_uniform_int_values[4];
+    let x_91 : i32 = x_6.x_GLF_uniform_int_values[4].el;
     let x_93 : i32 = b;
-    indexable = array<i32, 2>(x_89, x_91);
+    indexable = array<i32, 2u>(x_89, x_91);
     let x_95 : i32 = indexable[x_93];
     let x_96 : i32 = a;
     a = (x_96 + x_95);
@@ -79,12 +84,12 @@ fn main_1() {
     }
   }
   let x_100 : i32 = a;
-  let x_102 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_102 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   if ((x_100 == x_102)) {
-    let x_107 : i32 = x_6.x_GLF_uniform_int_values[3];
+    let x_107 : i32 = x_6.x_GLF_uniform_int_values[3].el;
-    let x_110 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_110 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-    let x_113 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_113 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-    let x_116 : i32 = x_6.x_GLF_uniform_int_values[3];
+    let x_116 : i32 = x_6.x_GLF_uniform_int_values[3].el;
     x_GLF_color = vec4<f32>(f32(x_107), f32(x_110), f32(x_113), f32(x_116));
   }
   return;
@@ -93,7 +98,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-cumulate-loops-unreachable/1.wgsl

@@ -6,7 +6,7 @@ fn main_1() {
   var i : i32;
   var i_1 : i32;
   var i_2 : i32;
-  var indexable : array<i32, 2>;
+  var indexable : array<i32, 2u>;
   a = 0;
   b = 1;
   x_GLF_color = vec4<f32>(0.0, 0.0, 0.0, 0.0);
@@ -47,7 +47,7 @@ fn main_1() {
       break;
     }
     let x_65 : i32 = b;
-    indexable = array<i32, 2>(1, 2);
+    indexable = array<i32, 2u>(1, 2);
     let x_67 : i32 = indexable[x_65];
     let x_68 : i32 = a;
     a = (x_68 + x_67);
@@ -67,7 +67,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-clamp-undefined-access-array/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<f32, 3>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 3u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 3>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_6 : buf1;
 
@@ -17,34 +27,34 @@ struct buf0 {
 var<private> x_GLF_color : vec4<f32>;
 
 fn main_1() {
-  var A1 : array<f32, 3>;
+  var A1 : array<f32, 3u>;
   var a : i32;
   var b : f32;
   var c : bool;
   var x_36 : bool;
-  let x_38 : f32 = x_6.x_GLF_uniform_float_values[2];
+  let x_38 : f32 = x_6.x_GLF_uniform_float_values[2].el;
-  let x_40 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_40 : f32 = x_6.x_GLF_uniform_float_values[0].el;
-  let x_42 : f32 = x_6.x_GLF_uniform_float_values[1];
+  let x_42 : f32 = x_6.x_GLF_uniform_float_values[1].el;
-  A1 = array<f32, 3>(x_38, x_40, x_42);
+  A1 = array<f32, 3u>(x_38, x_40, x_42);
-  let x_45 : i32 = x_9.x_GLF_uniform_int_values[0];
+  let x_45 : i32 = x_9.x_GLF_uniform_int_values[0].el;
-  let x_47 : i32 = x_9.x_GLF_uniform_int_values[0];
+  let x_47 : i32 = x_9.x_GLF_uniform_int_values[0].el;
-  let x_49 : i32 = x_9.x_GLF_uniform_int_values[1];
+  let x_49 : i32 = x_9.x_GLF_uniform_int_values[1].el;
   a = clamp(x_45, x_47, x_49);
   let x_51 : i32 = a;
-  let x_53 : i32 = x_9.x_GLF_uniform_int_values[1];
+  let x_53 : i32 = x_9.x_GLF_uniform_int_values[1].el;
-  let x_55 : i32 = x_9.x_GLF_uniform_int_values[0];
+  let x_55 : i32 = x_9.x_GLF_uniform_int_values[0].el;
   let x_58 : f32 = A1[clamp(x_51, x_53, x_55)];
   b = x_58;
   let x_59 : f32 = b;
-  let x_61 : i32 = x_9.x_GLF_uniform_int_values[1];
+  let x_61 : i32 = x_9.x_GLF_uniform_int_values[1].el;
   let x_63 : f32 = A1[x_61];
   if ((x_59 < x_63)) {
-    let x_69 : f32 = x_6.x_GLF_uniform_float_values[0];
+    let x_69 : f32 = x_6.x_GLF_uniform_float_values[0].el;
-    let x_71 : f32 = x_6.x_GLF_uniform_float_values[2];
+    let x_71 : f32 = x_6.x_GLF_uniform_float_values[2].el;
     x_36 = (x_69 > x_71);
   } else {
-    let x_74 : f32 = x_6.x_GLF_uniform_float_values[0];
+    let x_74 : f32 = x_6.x_GLF_uniform_float_values[0].el;
-    let x_76 : i32 = x_9.x_GLF_uniform_int_values[2];
+    let x_76 : i32 = x_9.x_GLF_uniform_int_values[2].el;
     let x_78 : f32 = A1[x_76];
     x_36 = (x_74 < x_78);
   }
@@ -52,13 +62,13 @@ fn main_1() {
   c = x_80;
   let x_81 : bool = c;
   if (x_81) {
-    let x_86 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_86 : i32 = x_9.x_GLF_uniform_int_values[0].el;
-    let x_89 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_89 : i32 = x_9.x_GLF_uniform_int_values[1].el;
-    let x_92 : i32 = x_9.x_GLF_uniform_int_values[1];
+    let x_92 : i32 = x_9.x_GLF_uniform_int_values[1].el;
-    let x_95 : i32 = x_9.x_GLF_uniform_int_values[0];
+    let x_95 : i32 = x_9.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_86), f32(x_89), f32(x_92), f32(x_95));
   } else {
-    let x_99 : f32 = x_6.x_GLF_uniform_float_values[0];
+    let x_99 : f32 = x_6.x_GLF_uniform_float_values[0].el;
     x_GLF_color = vec4<f32>(x_99, x_99, x_99, x_99);
   }
   return;
@@ -67,7 +77,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-combine-casts-legalize-vector-types-xyz-swizzle-for-loop/0-opt.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<i32, 4>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -11,14 +16,14 @@ var<private> x_GLF_color : vec4<f32>;
 fn main_1() {
   var v : vec4<f32>;
   var i : i32;
-  let x_36 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_36 : i32 = x_6.x_GLF_uniform_int_values[3].el;
   let x_37 : f32 = f32(x_36);
   v = vec4<f32>(x_37, x_37, x_37, x_37);
-  let x_40 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_40 : i32 = x_6.x_GLF_uniform_int_values[0].el;
   i = x_40;
   loop {
     let x_45 : i32 = i;
-    let x_47 : i32 = x_6.x_GLF_uniform_int_values[3];
+    let x_47 : i32 = x_6.x_GLF_uniform_int_values[3].el;
     if ((x_45 < x_47)) {
     } else {
       break;
@@ -33,18 +38,18 @@ fn main_1() {
     }
   }
   let x_57 : vec4<f32> = v;
-  let x_59 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_59 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-  let x_62 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_62 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-  let x_65 : i32 = x_6.x_GLF_uniform_int_values[2];
+  let x_65 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-  let x_68 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_68 : i32 = x_6.x_GLF_uniform_int_values[3].el;
   if (all((x_57 == vec4<f32>(f32(x_59), f32(x_62), f32(x_65), f32(x_68))))) {
-    let x_77 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_77 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_80 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_80 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_83 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_83 : i32 = x_6.x_GLF_uniform_int_values[0].el;
-    let x_86 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_86 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     x_GLF_color = vec4<f32>(f32(x_77), f32(x_80), f32(x_83), f32(x_86));
   } else {
-    let x_90 : i32 = x_6.x_GLF_uniform_int_values[0];
+    let x_90 : i32 = x_6.x_GLF_uniform_int_values[0].el;
     let x_91 : f32 = f32(x_90);
     x_GLF_color = vec4<f32>(x_91, x_91, x_91, x_91);
   }
@@ -54,7 +59,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-glf_color/0-opt.wgsl

@@ -1,14 +1,24 @@
-type Arr = @stride(16) array<f32, 4>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 4u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 2>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 2u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 var<private> x_GLF_color : vec4<f32>;
 
@@ -17,19 +27,19 @@ var<private> x_GLF_color : vec4<f32>;
 @group(0) @binding(0) var<uniform> x_12 : buf0;
 
 fn func_f1_(b : ptr<function, f32>) -> f32 {
-  let x_90 : f32 = x_7.x_GLF_uniform_float_values[0];
+  let x_90 : f32 = x_7.x_GLF_uniform_float_values[0].el;
-  let x_92 : f32 = x_7.x_GLF_uniform_float_values[0];
+  let x_92 : f32 = x_7.x_GLF_uniform_float_values[0].el;
-  let x_94 : f32 = x_7.x_GLF_uniform_float_values[1];
+  let x_94 : f32 = x_7.x_GLF_uniform_float_values[1].el;
   x_GLF_color = vec4<f32>(x_90, x_92, x_94, 1.0);
   let x_96 : vec4<f32> = x_GLF_color;
   x_GLF_color = x_96;
-  let x_98 : f32 = x_7.x_GLF_uniform_float_values[0];
+  let x_98 : f32 = x_7.x_GLF_uniform_float_values[0].el;
   let x_99 : f32 = *(b);
   if ((x_98 >= x_99)) {
-    let x_104 : f32 = x_7.x_GLF_uniform_float_values[0];
+    let x_104 : f32 = x_7.x_GLF_uniform_float_values[0].el;
     return x_104;
   }
-  let x_106 : f32 = x_7.x_GLF_uniform_float_values[2];
+  let x_106 : f32 = x_7.x_GLF_uniform_float_values[2].el;
   return x_106;
 }
 
@@ -39,38 +49,38 @@ fn main_1() {
   var param_1 : f32;
   var x_71 : bool;
   var x_72_phi : bool;
-  let x_44 : f32 = x_7.x_GLF_uniform_float_values[0];
+  let x_44 : f32 = x_7.x_GLF_uniform_float_values[0].el;
   param = x_44;
   let x_45 : f32 = func_f1_(&(param));
   a = x_45;
-  let x_47 : f32 = x_7.x_GLF_uniform_float_values[0];
+  let x_47 : f32 = x_7.x_GLF_uniform_float_values[0].el;
-  let x_49 : f32 = x_7.x_GLF_uniform_float_values[0];
+  let x_49 : f32 = x_7.x_GLF_uniform_float_values[0].el;
   param_1 = (x_47 + x_49);
   let x_51 : f32 = func_f1_(&(param_1));
   let x_52 : f32 = a;
   a = (x_52 + x_51);
   let x_54 : f32 = a;
-  let x_56 : f32 = x_7.x_GLF_uniform_float_values[3];
+  let x_56 : f32 = x_7.x_GLF_uniform_float_values[3].el;
   let x_57 : bool = (x_54 == x_56);
   x_72_phi = x_57;
   if (x_57) {
     let x_60 : vec4<f32> = x_GLF_color;
-    let x_62 : f32 = x_7.x_GLF_uniform_float_values[0];
+    let x_62 : f32 = x_7.x_GLF_uniform_float_values[0].el;
-    let x_64 : f32 = x_7.x_GLF_uniform_float_values[0];
+    let x_64 : f32 = x_7.x_GLF_uniform_float_values[0].el;
-    let x_66 : f32 = x_7.x_GLF_uniform_float_values[1];
+    let x_66 : f32 = x_7.x_GLF_uniform_float_values[1].el;
-    let x_68 : f32 = x_7.x_GLF_uniform_float_values[0];
+    let x_68 : f32 = x_7.x_GLF_uniform_float_values[0].el;
     x_71 = all((x_60 == vec4<f32>(x_62, x_64, x_66, x_68)));
     x_72_phi = x_71;
   }
   let x_72 : bool = x_72_phi;
   if (x_72) {
-    let x_15 : i32 = x_12.x_GLF_uniform_int_values[0];
+    let x_15 : i32 = x_12.x_GLF_uniform_int_values[0].el;
-    let x_16 : i32 = x_12.x_GLF_uniform_int_values[1];
+    let x_16 : i32 = x_12.x_GLF_uniform_int_values[1].el;
-    let x_17 : i32 = x_12.x_GLF_uniform_int_values[1];
+    let x_17 : i32 = x_12.x_GLF_uniform_int_values[1].el;
-    let x_18 : i32 = x_12.x_GLF_uniform_int_values[0];
+    let x_18 : i32 = x_12.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_15), f32(x_16), f32(x_17), f32(x_18));
   } else {
-    let x_19 : i32 = x_12.x_GLF_uniform_int_values[1];
+    let x_19 : i32 = x_12.x_GLF_uniform_int_values[1].el;
     let x_86 : f32 = f32(x_19);
     x_GLF_color = vec4<f32>(x_86, x_86, x_86, x_86);
   }
@@ -80,7 +90,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-increment-color/0-opt.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<f32, 4>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -10,23 +15,23 @@ var<private> x_GLF_color : vec4<f32>;
 
 fn main_1() {
   var a : f32;
-  let x_30 : f32 = x_6.x_GLF_uniform_float_values[1];
+  let x_30 : f32 = x_6.x_GLF_uniform_float_values[1].el;
   a = x_30;
-  let x_32 : f32 = x_6.x_GLF_uniform_float_values[3];
+  let x_32 : f32 = x_6.x_GLF_uniform_float_values[3].el;
-  let x_34 : f32 = x_6.x_GLF_uniform_float_values[0];
+  let x_34 : f32 = x_6.x_GLF_uniform_float_values[0].el;
   if ((x_32 > x_34)) {
-    let x_39 : f32 = x_6.x_GLF_uniform_float_values[0];
+    let x_39 : f32 = x_6.x_GLF_uniform_float_values[0].el;
     let x_40 : f32 = a;
     a = (x_40 + x_39);
     let x_42 : f32 = a;
     x_GLF_color = vec4<f32>(x_42, x_42, x_42, x_42);
-    let x_45 : f32 = x_6.x_GLF_uniform_float_values[3];
+    let x_45 : f32 = x_6.x_GLF_uniform_float_values[3].el;
-    let x_47 : f32 = x_6.x_GLF_uniform_float_values[1];
+    let x_47 : f32 = x_6.x_GLF_uniform_float_values[1].el;
     if ((x_45 > x_47)) {
       let x_52 : f32 = x_GLF_color.x;
       let x_53 : f32 = a;
       a = (x_53 + x_52);
-      let x_56 : f32 = x_6.x_GLF_uniform_float_values[2];
+      let x_56 : f32 = x_6.x_GLF_uniform_float_values[2].el;
       x_GLF_color = vec4<f32>(x_56, x_56, x_56, x_56);
     }
   }
@@ -38,7 +43,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl

@@ -1,65 +0,0 @@
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct strided_arr {
-  int el;
-};
-
-struct buf0 {
-  strided_arr x_GLF_uniform_int_values[4];
-};
-
-layout(binding = 0) uniform buf0_1 {
-  strided_arr x_GLF_uniform_int_values[4];
-} x_6;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-void main_1() {
-  int a = 0;
-  int i = 0;
-  int x_27 = x_6.x_GLF_uniform_int_values[1].el;
-  a = x_27;
-  int x_29 = x_6.x_GLF_uniform_int_values[3].el;
-  i = -(x_29);
-  while (true) {
-    int x_36 = (i + 1);
-    i = x_36;
-    int x_39 = x_6.x_GLF_uniform_int_values[2].el;
-    if ((bitfieldReverse(x_36) <= x_39)) {
-    } else {
-      break;
-    }
-    a = (a + 1);
-  }
-  int x_44 = a;
-  int x_46 = x_6.x_GLF_uniform_int_values[0].el;
-  if ((x_44 == x_46)) {
-    int x_52 = x_6.x_GLF_uniform_int_values[2].el;
-    int x_55 = x_6.x_GLF_uniform_int_values[1].el;
-    int x_58 = x_6.x_GLF_uniform_int_values[1].el;
-    int x_61 = x_6.x_GLF_uniform_int_values[2].el;
-    x_GLF_color = vec4(float(x_52), float(x_55), float(x_58), float(x_61));
-  } else {
-    int x_65 = x_6.x_GLF_uniform_int_values[1].el;
-    float x_66 = float(x_65);
-    x_GLF_color = vec4(x_66, x_66, x_66, x_66);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol() {
-  main_1();
-  main_out tint_symbol_1 = main_out(x_GLF_color);
-  return tint_symbol_1;
-}
-
-void main() {
-  main_out inner_result = tint_symbol();
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl

@@ -1,8 +1,13 @@
-type Arr = @stride(16) array<i32, 4>;
+struct strided_arr {
+  @size(16)
+  el : i32;
+}
+
+type Arr = array<strided_arr, 4u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -11,15 +16,15 @@ var<private> x_GLF_color : vec4<f32>;
 fn main_1() {
   var a : i32;
   var i : i32;
-  let x_27 : i32 = x_6.x_GLF_uniform_int_values[1];
+  let x_27 : i32 = x_6.x_GLF_uniform_int_values[1].el;
   a = x_27;
-  let x_29 : i32 = x_6.x_GLF_uniform_int_values[3];
+  let x_29 : i32 = x_6.x_GLF_uniform_int_values[3].el;
   i = -(x_29);
   loop {
     let x_35 : i32 = i;
     let x_36 : i32 = (x_35 + 1);
     i = x_36;
-    let x_39 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_39 : i32 = x_6.x_GLF_uniform_int_values[2].el;
     if ((reverseBits(x_36) <= x_39)) {
     } else {
       break;
@@ -28,15 +33,15 @@ fn main_1() {
     a = (x_42 + 1);
   }
   let x_44 : i32 = a;
-  let x_46 : i32 = x_6.x_GLF_uniform_int_values[0];
+  let x_46 : i32 = x_6.x_GLF_uniform_int_values[0].el;
   if ((x_44 == x_46)) {
-    let x_52 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_52 : i32 = x_6.x_GLF_uniform_int_values[2].el;
-    let x_55 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_55 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_58 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_58 : i32 = x_6.x_GLF_uniform_int_values[1].el;
-    let x_61 : i32 = x_6.x_GLF_uniform_int_values[2];
+    let x_61 : i32 = x_6.x_GLF_uniform_int_values[2].el;
     x_GLF_color = vec4<f32>(f32(x_52), f32(x_55), f32(x_58), f32(x_61));
   } else {
-    let x_65 : i32 = x_6.x_GLF_uniform_int_values[1];
+    let x_65 : i32 = x_6.x_GLF_uniform_int_values[1].el;
     let x_66 : f32 = f32(x_65);
     x_GLF_color = vec4<f32>(x_66, x_66, x_66, x_66);
   }
@@ -46,7 +51,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl.expected.glsl

@@ -1,69 +0,0 @@
-vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr = @stride(16) array<i32, 4>;
-            ^^^^^^
-
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct tint_padded_array_element {
-  int el;
-};
-
-struct buf0 {
-  tint_padded_array_element x_GLF_uniform_int_values[4];
-};
-
-layout(binding = 0) uniform buf0_1 {
-  tint_padded_array_element x_GLF_uniform_int_values[4];
-} x_6;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-void main_1() {
-  int a = 0;
-  int i = 0;
-  int x_27 = x_6.x_GLF_uniform_int_values[1].el;
-  a = x_27;
-  int x_29 = x_6.x_GLF_uniform_int_values[3].el;
-  i = -(x_29);
-  while (true) {
-    int x_36 = (i + 1);
-    i = x_36;
-    int x_39 = x_6.x_GLF_uniform_int_values[2].el;
-    if ((bitfieldReverse(x_36) <= x_39)) {
-    } else {
-      break;
-    }
-    a = (a + 1);
-  }
-  int x_44 = a;
-  int x_46 = x_6.x_GLF_uniform_int_values[0].el;
-  if ((x_44 == x_46)) {
-    int x_52 = x_6.x_GLF_uniform_int_values[2].el;
-    int x_55 = x_6.x_GLF_uniform_int_values[1].el;
-    int x_58 = x_6.x_GLF_uniform_int_values[1].el;
-    int x_61 = x_6.x_GLF_uniform_int_values[2].el;
-    x_GLF_color = vec4(float(x_52), float(x_55), float(x_58), float(x_61));
-  } else {
-    int x_65 = x_6.x_GLF_uniform_int_values[1].el;
-    float x_66 = float(x_65);
-    x_GLF_color = vec4(x_66, x_66, x_66, x_66);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol() {
-  main_1();
-  main_out tint_symbol_1 = main_out(x_GLF_color);
-  return tint_symbol_1;
-}
-
-void main() {
-  main_out inner_result = tint_symbol();
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-neg-div-pow2/0-opt.wgsl

@@ -1,10 +1,10 @@
 struct buf1 {
   ten : i32;
-};
+}
 
 struct buf0 {
   minusEight : i32;
-};
+}
 
 @group(0) @binding(1) var<uniform> x_8 : buf1;
 
@@ -53,7 +53,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-dag-combiner-same-cond-nested/0-opt.wgsl

@@ -1,6 +1,6 @@
 struct buf0 {
   one : f32;
-};
+}
 
 @group(0) @binding(0) var<uniform> x_6 : buf0;
 
@@ -68,7 +68,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-dead-branch-func-return-arg/0-opt.wgsl

@@ -110,7 +110,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.wgsl

@@ -1,12 +1,12 @@
 struct buf0 {
   injectionSwitch : vec2<f32>;
-};
+}
 
 var<private> gl_FragCoord : vec4<f32>;
 
-var<private> array0 : array<f32, 3>;
+var<private> array0 : array<f32, 3u>;
 
-var<private> array1 : array<f32, 3>;
+var<private> array1 : array<f32, 3u>;
 
 @group(0) @binding(0) var<uniform> x_11 : buf0;
 
@@ -74,7 +74,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {

test/tint/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl

@@ -1,100 +0,0 @@
-#version 310 es
-precision mediump float;
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct strided_arr {
-  float el;
-};
-
-struct buf1 {
-  strided_arr x_GLF_uniform_float_values[2];
-};
-
-struct strided_arr_1 {
-  int el;
-};
-
-struct buf0 {
-  strided_arr_1 x_GLF_uniform_int_values[3];
-};
-
-struct buf2 {
-  vec2 injectionSwitch;
-};
-
-int x_GLF_global_loop_count = 0;
-layout(binding = 1) uniform buf1_1 {
-  strided_arr x_GLF_uniform_float_values[2];
-} x_7;
-
-layout(binding = 0) uniform buf0_1 {
-  strided_arr_1 x_GLF_uniform_int_values[3];
-} x_10;
-
-layout(binding = 2) uniform buf2_1 {
-  vec2 injectionSwitch;
-} x_12;
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-void main_1() {
-  float f = 0.0f;
-  int r = 0;
-  x_GLF_global_loop_count = 0;
-  float x_42 = x_7.x_GLF_uniform_float_values[0].el;
-  f = x_42;
-  int x_44 = x_10.x_GLF_uniform_int_values[1].el;
-  r = x_44;
-  while (true) {
-    int x_49 = r;
-    int x_51 = x_10.x_GLF_uniform_int_values[2].el;
-    if ((x_49 < x_51)) {
-    } else {
-      break;
-    }
-    x_GLF_global_loop_count = (x_GLF_global_loop_count + 1);
-    vec2 x_57 = x_12.injectionSwitch;
-    f = (f + dFdx(x_57).y);
-    {
-      r = (r + 1);
-    }
-  }
-  while (true) {
-    if ((x_GLF_global_loop_count < 100)) {
-    } else {
-      break;
-    }
-    x_GLF_global_loop_count = (x_GLF_global_loop_count + 1);
-    float x_74 = x_7.x_GLF_uniform_float_values[0].el;
-    f = (f + x_74);
-  }
-  float x_77 = f;
-  float x_79 = x_7.x_GLF_uniform_float_values[1].el;
-  if ((x_77 == x_79)) {
-    int x_85 = x_10.x_GLF_uniform_int_values[0].el;
-    int x_88 = x_10.x_GLF_uniform_int_values[1].el;
-    int x_91 = x_10.x_GLF_uniform_int_values[1].el;
-    int x_94 = x_10.x_GLF_uniform_int_values[0].el;
-    x_GLF_color = vec4(float(x_85), float(x_88), float(x_91), float(x_94));
-  } else {
-    int x_98 = x_10.x_GLF_uniform_int_values[1].el;
-    float x_99 = float(x_98);
-    x_GLF_color = vec4(x_99, x_99, x_99, x_99);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol() {
-  main_1();
-  main_out tint_symbol_1 = main_out(x_GLF_color);
-  return tint_symbol_1;
-}
-
-void main() {
-  main_out inner_result = tint_symbol();
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}

test/tint/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl

@@ -1,18 +1,28 @@
-type Arr = @stride(16) array<f32, 2>;
+struct strided_arr {
+  @size(16)
+  el : f32;
+}
+
+type Arr = array<strided_arr, 2u>;
 
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
-};
+}
 
-type Arr_1 = @stride(16) array<i32, 3>;
+struct strided_arr_1 {
+  @size(16)
+  el : i32;
+}
+
+type Arr_1 = array<strided_arr_1, 3u>;
 
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
-};
+}
 
 struct buf2 {
   injectionSwitch : vec2<f32>;
-};
+}
 
 var<private> x_GLF_global_loop_count : i32;
 
@@ -28,13 +38,13 @@ fn main_1() {
   var f : f32;
   var r : i32;
   x_GLF_global_loop_count = 0;
-  let x_42 : f32 = x_7.x_GLF_uniform_float_values[0];
+  let x_42 : f32 = x_7.x_GLF_uniform_float_values[0].el;
   f = x_42;
-  let x_44 : i32 = x_10.x_GLF_uniform_int_values[1];
+  let x_44 : i32 = x_10.x_GLF_uniform_int_values[1].el;
   r = x_44;
   loop {
     let x_49 : i32 = r;
-    let x_51 : i32 = x_10.x_GLF_uniform_int_values[2];
+    let x_51 : i32 = x_10.x_GLF_uniform_int_values[2].el;
     if ((x_49 < x_51)) {
     } else {
       break;
@@ -58,20 +68,20 @@ fn main_1() {
     }
     let x_71 : i32 = x_GLF_global_loop_count;
     x_GLF_global_loop_count = (x_71 + 1);
-    let x_74 : f32 = x_7.x_GLF_uniform_float_values[0];
+    let x_74 : f32 = x_7.x_GLF_uniform_float_values[0].el;
     let x_75 : f32 = f;
     f = (x_75 + x_74);
   }
   let x_77 : f32 = f;
-  let x_79 : f32 = x_7.x_GLF_uniform_float_values[1];
+  let x_79 : f32 = x_7.x_GLF_uniform_float_values[1].el;
   if ((x_77 == x_79)) {
-    let x_85 : i32 = x_10.x_GLF_uniform_int_values[0];
+    let x_85 : i32 = x_10.x_GLF_uniform_int_values[0].el;
-    let x_88 : i32 = x_10.x_GLF_uniform_int_values[1];
+    let x_88 : i32 = x_10.x_GLF_uniform_int_values[1].el;
-    let x_91 : i32 = x_10.x_GLF_uniform_int_values[1];
+    let x_91 : i32 = x_10.x_GLF_uniform_int_values[1].el;
-    let x_94 : i32 = x_10.x_GLF_uniform_int_values[0];
+    let x_94 : i32 = x_10.x_GLF_uniform_int_values[0].el;
     x_GLF_color = vec4<f32>(f32(x_85), f32(x_88), f32(x_91), f32(x_94));
   } else {
-    let x_98 : i32 = x_10.x_GLF_uniform_int_values[1];
+    let x_98 : i32 = x_10.x_GLF_uniform_int_values[1].el;
     let x_99 : f32 = f32(x_98);
     x_GLF_color = vec4<f32>(x_99, x_99, x_99, x_99);
   }
@@ -81,7 +91,7 @@ fn main_1() {
 struct main_out {
   @location(0)
   x_GLF_color_1 : vec4<f32>;
-};
+}
 
 @stage(fragment)
 fn main() -> main_out {