wip: dealing with exit_to

vyperlang · Jan 19, 2022 · ec3ccaa · ec3ccaa
1 parent 617bc8d
commit ec3ccaa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/vyper/codegen/stmt.py b/vyper/codegen/stmt.py
@@ -456,5 +456,11 @@ def parse_body(code, context):
     for stmt in code:
         lll = parse_stmt(stmt, context)
         lll_node.append(lll)
-    lll_node.append("pass")  # force zerovalent, even last statement
+
+    # force using the return routine / exit_to cleanup for end of function
+    if context.return_type is None and lll_node[-1].value != "exit_to":
+        lll_node.append(parse_stmt(vy_ast.Return(None), context))
+
+    # force zerovalent, even last statement
+    lll_node.append("pass") # CMC 2022-01-16 is this necessary?
     return LLLnode.from_list(lll_node, pos=getpos(code[0]) if code else None)
diff --git a/vyper/utils.py b/vyper/utils.py
@@ -158,6 +158,7 @@ def in_bounds(cls, type_str, value):
 }
 
 # List of valid LLL macros.
+# TODO move this somewhere else, like lll_node.py
 VALID_LLL_MACROS = {
     "assert",
     "break",