[core] codegen: Fix use of invoke when cleanup is also present

nac3artiq/demo/sret_invoke.py

@@ -0,0 +1,27 @@
+from min_artiq import *
+from numpy import int32, int64
+
+
+@extern
+def get_tuple() -> tuple[int64, int32, bool]:
+    raise NotImplementedError("syscall not simulated")
+
+
+@compile
+class SretInvokeRepro:
+    core: KernelInvariant[Core]
+
+    def __init__(self):
+        self.core = Core()
+
+    @kernel
+    def call_sret(self):
+        (a, b, c) = get_tuple()
+
+    @kernel
+    def run(self):
+        self.call_sret()
+
+
+if __name__ == "__main__":
+    SretInvokeRepro().run()

nac3core/src/codegen/expr.rs

@@ -446,17 +446,19 @@ impl<'ctx> CodeGenContext<'ctx, '_> {
                     self.builder.get_insert_block().and_then(BasicBlock::get_parent).unwrap();
                 let then_block =
                     self.ctx.append_basic_block(current, &format!("after.{call_name}"));
-                let result = self.fn_store.do_call(
+                self.fn_store.do_call(
                     fun,
                     self.builder,
                     args,
                     |value, args| {
-                        Ok(self.builder.build_invoke(value, args, then_block, target, call_name)?)
+                        let invoke = self.builder.build_invoke(
+                            value, args, then_block, target, call_name,
+                        )?;
+                        self.builder.position_at_end(then_block);
+                        Ok(invoke)
                     },
                     allocate,
-                );
-                self.builder.position_at_end(then_block);
-                result
+                )
             },
         )
     }