fix[venom]: fix inliner return items

vyper/venom/basicblock.py

@@ -798,7 +798,10 @@ def copy(self) -> IRBasicBlock:
     def __repr__(self) -> str:
         printer = ir_printer.get()
 
-        s = f"{repr(self.label)}:  ; OUT={[bb.label for bb in self.out_bbs]}\n"
+        s = f"{repr(self.label)}:"
+        if self.is_terminated:
+            s += f"  ; OUT={[bb.label for bb in self.out_bbs]}"
+        s += "\n"
         if printer and hasattr(printer, "_pre_block"):
             s += printer._pre_block(self)
         for inst in self.instructions:

vyper/venom/passes/function_inliner.py

@@ -141,6 +141,17 @@
                     inst.opcode = "store"
                     inst.operands = [inst.operands[0]]
                 elif inst.opcode == "ret":
+                    if call_site.output is not None:
+                        # only handle 1 output from invoke.. the other
+                        # is the return pc. if there are more in the future,
+                        # we need to loop, 1 store for every output.
+                        assert len(inst.operands) == 2, inst
+                        return_value = inst.operands[0]
+                        set_output_inst = IRInstruction(
+                            "store", [return_value], output=call_site.output
+                        )
+                        call_site_return.insert_instruction(set_output_inst, index=0)
+
                     inst.opcode = "jmp"
                     inst.operands = [call_site_return.label]
 

vyper/venom/passes/machinery/inst_updater.py

@@ -51,7 +51,7 @@ def update(
             if isinstance(op, IRVariable):
                 self.dfg.add_use(op, inst)
 
-        if opcode in NO_OUTPUT_INSTRUCTIONS:
+        if opcode in NO_OUTPUT_INSTRUCTIONS and opcode != "invoke":
             if inst.output is not None:
                 assert new_output is None
                 assert len(uses := self.dfg.get_uses(inst.output)) == 0, (inst, uses)