improve implicit returns from functions

andogq · Aug 15, 2024 · 780e32c · 780e32c
1 parent 425322c
commit 780e32c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -7,11 +7,11 @@ fn main() {
                 return n;
             }
 
-            return fib(n - 1) + fib(n - 2);
+            fib(n - 1) + fib(n - 2)
         }
 
         fn main() -> int {
-            return fib(19);
+            fib(19)
         }"#;
 
     let result = compile_and_run(source, true);

diff --git a/src/stage/lower_ir/lowering/mod.rs b/src/stage/lower_ir/lowering/mod.rs
@@ -26,7 +26,12 @@ fn lower_function(ctx: &mut impl IRCtx, function: ast::Function) {
         });
 
     // Perform the lowering
-    lower_block(ctx, &mut builder, &function.body);
+    let value = lower_block(ctx, &mut builder, &function.body);
+
+    // If implicit return, add in a return statement
+    if !matches!(value, Value::Unit) {
+        builder.set_terminator(Terminator::Return(value));
+    }
 
     // Consume the builder
     builder.build(ctx);