[spv_in] Finish emitter after function arguments (#7397)

LegNeato · web-flow · commit 10cd1ccd8ca2 · 2025-03-24T10:36:30.000+01:00
Fixes #7358.
diff --git a/naga/src/front/spv/mod.rs b/naga/src/front/spv/mod.rs
@@ -3040,7 +3040,6 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
                 }
                 Op::FunctionCall => {
                     inst.expect_at_least(4)?;
-                    block.extend(emitter.finish(ctx.expressions));
 
                     let result_type_id = self.next()?;
                     let result_id = self.next()?;
@@ -3053,6 +3052,8 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
                         arguments.push(get_expr_handle!(arg_id, lexp));
                     }
 
+                    block.extend(emitter.finish(ctx.expressions));
+
                     // We just need an unique handle here, nothing more.
                     let function = self.add_call(ctx.function_id, func_id);
 

Original file line number	Diff line number	Diff line change
`@@ -3040,7 +3040,6 @@ impl<I: Iterator<Item = u32>> Frontend<I> {`
`3040`	`3040`	`}`
`3041`	`3041`	`Op::FunctionCall => {`
`3042`	`3042`	`inst.expect_at_least(4)?;`
`3043`		`- block.extend(emitter.finish(ctx.expressions));`
`3044`	`3043`
`3045`	`3044`	`let result_type_id = self.next()?;`
`3046`	`3045`	`let result_id = self.next()?;`
`@@ -3053,6 +3052,8 @@ impl<I: Iterator<Item = u32>> Frontend<I> {`
`3053`	`3052`	`arguments.push(get_expr_handle!(arg_id, lexp));`
`3054`	`3053`	`}`
`3055`	`3054`
	`3055`	`+ block.extend(emitter.finish(ctx.expressions));`
	`3056`	`+`
`3056`	`3057`	`// We just need an unique handle here, nothing more.`
`3057`	`3058`	`let function = self.add_call(ctx.function_id, func_id);`
`3058`	`3059`