[naga] Don't treat Emit statements as return statements during ensure_block_returns() (#7013)

Author: jamienicol

naga/src/front/glsl/functions.rs

@@ -1031,7 +1031,9 @@ impl Frontend {
         result: Option<FunctionResult>,
         meta: Span,
     ) {
-        ensure_block_returns(&mut ctx.body);
+        if result.is_some() {
+            ensure_block_returns(&mut ctx.body);
+        }
 
         let void = result.is_none();
 

naga/src/front/wgsl/lower/mod.rs

@@ -1307,7 +1307,9 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
             global_expression_kind_tracker: ctx.global_expression_kind_tracker,
         };
         let mut body = self.block(&f.body, false, &mut stmt_ctx)?;
-        ensure_block_returns(&mut body);
+        if function.result.is_some() {
+            ensure_block_returns(&mut body);
+        }
 
         function.body = body;
         function.named_expressions = named_expressions

naga/src/proc/terminator.rs

@@ -28,9 +28,10 @@ pub fn ensure_block_returns(block: &mut crate::Block) {
                 }
             }
         }
-        Some(&mut (S::Emit(_) | S::Break | S::Continue | S::Return { .. } | S::Kill)) => (),
+        Some(&mut (S::Break | S::Continue | S::Return { .. } | S::Kill)) => (),
         Some(
-            &mut (S::Loop { .. }
+            &mut (S::Emit(_)
+            | S::Loop { .. }
             | S::Store { .. }
             | S::ImageStore { .. }
             | S::Call { .. }

naga/tests/out/glsl/access.assign_through_ptr.Compute.glsl

@@ -44,12 +44,10 @@ float test_arr_as_arg(float a[5][10]) {
 
 void assign_through_ptr_fn(inout uint p) {
     p = 42u;
-    return;
 }
 
 void assign_array_through_ptr_fn(inout vec4 foo_2[2]) {
     foo_2 = vec4[2](vec4(1.0), vec4(2.0));
-    return;
 }
 
 uint fetch_arg_ptr_member(inout AssignToMember p_1) {
@@ -59,7 +57,6 @@ uint fetch_arg_ptr_member(inout AssignToMember p_1) {
 
 void assign_to_arg_ptr_member(inout AssignToMember p_2) {
     p_2.x = 10u;
-    return;
 }
 
 uint fetch_arg_ptr_array_element(inout uint p_3[4]) {
@@ -69,7 +66,6 @@ uint fetch_arg_ptr_array_element(inout uint p_3[4]) {
 
 void assign_to_arg_ptr_array_element(inout uint p_4[4]) {
     p_4[1] = 10u;
-    return;
 }
 
 bool index_ptr(bool value) {
@@ -114,6 +110,5 @@ void main() {
     vec4 arr[2] = vec4[2](vec4(6.0), vec4(7.0));
     assign_through_ptr_fn(val);
     assign_array_through_ptr_fn(arr);
-    return;
 }
 

naga/tests/out/glsl/access.assign_to_ptr_components.Compute.glsl

@@ -44,12 +44,10 @@ float test_arr_as_arg(float a[5][10]) {
 
 void assign_through_ptr_fn(inout uint p) {
     p = 42u;
-    return;
 }
 
 void assign_array_through_ptr_fn(inout vec4 foo_2[2]) {
     foo_2 = vec4[2](vec4(1.0), vec4(2.0));
-    return;
 }
 
 uint fetch_arg_ptr_member(inout AssignToMember p_1) {
@@ -59,7 +57,6 @@ uint fetch_arg_ptr_member(inout AssignToMember p_1) {
 
 void assign_to_arg_ptr_member(inout AssignToMember p_2) {
     p_2.x = 10u;
-    return;
 }
 
 uint fetch_arg_ptr_array_element(inout uint p_3[4]) {
@@ -69,7 +66,6 @@ uint fetch_arg_ptr_array_element(inout uint p_3[4]) {
 
 void assign_to_arg_ptr_array_element(inout uint p_4[4]) {
     p_4[1] = 10u;
-    return;
 }
 
 bool index_ptr(bool value) {
@@ -116,6 +112,5 @@ void main() {
     uint _e1 = fetch_arg_ptr_member(s1_);
     assign_to_arg_ptr_array_element(a1_);
     uint _e3 = fetch_arg_ptr_array_element(a1_);
-    return;
 }
 

naga/tests/out/glsl/access.foo_frag.Fragment.glsl

@@ -54,12 +54,10 @@ float test_arr_as_arg(float a[5][10]) {
 
 void assign_through_ptr_fn(inout uint p) {
     p = 42u;
-    return;
 }
 
 void assign_array_through_ptr_fn(inout vec4 foo_2[2]) {
     foo_2 = vec4[2](vec4(1.0), vec4(2.0));
-    return;
 }
 
 uint fetch_arg_ptr_member(inout AssignToMember p_1) {
@@ -69,7 +67,6 @@ uint fetch_arg_ptr_member(inout AssignToMember p_1) {
 
 void assign_to_arg_ptr_member(inout AssignToMember p_2) {
     p_2.x = 10u;
-    return;
 }
 
 uint fetch_arg_ptr_array_element(inout uint p_3[4]) {
@@ -79,7 +76,6 @@ uint fetch_arg_ptr_array_element(inout uint p_3[4]) {
 
 void assign_to_arg_ptr_array_element(inout uint p_4[4]) {
     p_4[1] = 10u;
-    return;
 }
 
 bool index_ptr(bool value) {

naga/tests/out/glsl/access.foo_vert.Vertex.glsl

@@ -77,7 +77,6 @@ void test_matrix_within_struct_accesses() {
     int _e85 = idx;
     int _e87 = idx;
     t.m[_e85][_e87] = 40.0;
-    return;
 }
 
 void test_matrix_within_array_within_struct_accesses() {
@@ -113,7 +112,6 @@ void test_matrix_within_array_within_struct_accesses() {
     int _e100 = idx_1;
     int _e102 = idx_1;
     t_1.am[0][_e100][_e102] = 40.0;
-    return;
 }
 
 float read_from_private(inout float foo_1) {
@@ -127,12 +125,10 @@ float test_arr_as_arg(float a[5][10]) {
 
 void assign_through_ptr_fn(inout uint p) {
     p = 42u;
-    return;
 }
 
 void assign_array_through_ptr_fn(inout vec4 foo_2[2]) {
     foo_2 = vec4[2](vec4(1.0), vec4(2.0));
-    return;
 }
 
 uint fetch_arg_ptr_member(inout AssignToMember p_1) {
@@ -142,7 +138,6 @@ uint fetch_arg_ptr_member(inout AssignToMember p_1) {
 
 void assign_to_arg_ptr_member(inout AssignToMember p_2) {
     p_2.x = 10u;
-    return;
 }
 
 uint fetch_arg_ptr_array_element(inout uint p_3[4]) {
@@ -152,7 +147,6 @@ uint fetch_arg_ptr_array_element(inout uint p_3[4]) {
 
 void assign_to_arg_ptr_array_element(inout uint p_4[4]) {
     p_4[1] = 10u;
-    return;
 }
 
 bool index_ptr(bool value) {

naga/tests/out/glsl/atomicOps.cs_main.Compute.glsl

@@ -127,6 +127,5 @@ void main() {
     int _e295 = atomicExchange(workgroup_atomic_arr[1], 1);
     uint _e299 = atomicExchange(workgroup_struct.atomic_scalar, 1u);
     int _e304 = atomicExchange(workgroup_struct.atomic_arr[1], 1);
-    return;
 }
 

naga/tests/out/glsl/atomicTexture.cs_main.Compute.glsl

@@ -22,6 +22,5 @@ void main() {
     imageAtomicAnd(_group_0_binding_1_cs, ivec2(0, 0), 1);
     imageAtomicOr(_group_0_binding_1_cs, ivec2(0, 0), 1);
     imageAtomicXor(_group_0_binding_1_cs, ivec2(0, 0), 1);
-    return;
 }
 

naga/tests/out/glsl/bitcast.main.Compute.glsl

@@ -34,6 +34,5 @@ void main() {
     f3_ = intBitsToFloat(_e41);
     ivec4 _e43 = i4_;
     f4_ = intBitsToFloat(_e43);
-    return;
 }