bugfix with deferred blocks in macros with locals

diff --git a/bin/onyx b/bin/onyx
index 3fa5c3739fd972ebd0167ddc97d574980ce6a190..ac91d8d6e126c3fad1e73d89f57ecf2f1f46fe95 100755 (executable)
Binary files a/bin/onyx and b/bin/onyx differ

diff --git a/src/onyxwasm.c b/src/onyxwasm.c
index ff62a18514cd4db3459e91e49b20758c5fa23123..bec0833b19fb9643d8d39b715869b1cc8500cae0 100644 (file)
--- a/src/onyxwasm.c
+++ b/src/onyxwasm.c
@@ -294,8 +294,18 @@ EMIT_FUNC(block, AstBlock* block, b32 generate_block_headers) {
         emit_statement(mod, &code, stmt);
     }
 
-    if (block->rules & Block_Rule_Clear_Defer) emit_deferred_stmts(mod, &code);
-    if (block->rules & Block_Rule_New_Scope)   emit_free_local_allocations(mod, &code);
+    // HACK: I'm not convinced this is the best way to handle this case. Essentially, if
+    // a deferred statement uses a local that is freed from the a macro block, then the
+    // local won't be valid anymore and could have garbage data. This ensures that the
+    // freeing of the local variables and flushing of the deferred statements happen together,
+    // so a deferred statement can never try to use a local that has been freed.
+    //                                                                   - brendanfh 2021/08/29
+    if (block->rules & Block_Rule_Clear_Defer) {
+        emit_deferred_stmts(mod, &code);
+
+        // if (block->rules & Block_Rule_New_Scope)
+        emit_free_local_allocations(mod, &code);
+    }
 
     if (generate_block_headers)
         emit_leave_structured_block(mod, &code);
@@ -378,7 +388,7 @@ EMIT_FUNC(structured_jump, AstJump* jump) {
 
     i64 labelidx = get_structured_jump_label(mod, jump->jump, jump->count);
 
-    if (bh_arr_length(mod->deferred_stmts) != 0) {
+    if (bh_arr_length(mod->deferred_stmts) > 0) {
         i32 i = bh_arr_length(mod->deferred_stmts) - 1;
         i32 d = bh_arr_length(mod->structured_jump_target) - (labelidx + 1);
 
@@ -436,7 +446,7 @@ EMIT_FUNC_NO_ARGS(free_local_allocations) {
     if (bh_arr_length(mod->local_allocations) == 0) return;
 
     u64 depth = bh_arr_length(mod->structured_jump_target);
-    while (bh_arr_length(mod->local_allocations) > 0 && bh_arr_last(mod->local_allocations).depth == depth) {
+    while (bh_arr_length(mod->local_allocations) > 0 && bh_arr_last(mod->local_allocations).depth >= depth) {
         // CHECK: Not sure this next line is okay to be here...
         bh_imap_delete(&mod->local_map, (u64) bh_arr_last(mod->local_allocations).expr);
 
@@ -1204,18 +1214,18 @@ EMIT_FUNC(deferred_stmt, DeferredStmt deferred_stmt) {
             break;
         }
     }
-    
+
     *pcode = code;
 }
 
 EMIT_FUNC_NO_ARGS(deferred_stmts) {
-    if (bh_arr_length(mod->deferred_stmts) == 0) return;
+    if (bh_arr_length(mod->deferred_stmts) <= 0) return;
 
     u64 depth = bh_arr_length(mod->structured_jump_target);
 
     while (bh_arr_length(mod->deferred_stmts) > 0 && bh_arr_last(mod->deferred_stmts).depth >= depth) {
-        emit_deferred_stmt(mod, pcode, bh_arr_last(mod->deferred_stmts));
-        bh_arr_pop(mod->deferred_stmts);
+        DeferredStmt stmt = bh_arr_pop(mod->deferred_stmts);
+        emit_deferred_stmt(mod, pcode, stmt);
     }
 }
 
@@ -1480,7 +1490,7 @@ EMIT_FUNC(call, AstCall* call) {
 
                 reserve_size += any_size;
             }
-            
+
             // fallthrough
         }
 
@@ -2845,7 +2855,7 @@ EMIT_FUNC(return, AstReturn* ret) {
     emit_deferred_stmts(mod, &code);
 
     // Clear the rest of the deferred statements
-    if (bh_arr_length(mod->deferred_stmts) != 0) {
+    if (bh_arr_length(mod->deferred_stmts) > 0) {
         i32 i = bh_arr_length(mod->deferred_stmts) - 1;
         while (i >= 0) {
             emit_deferred_stmt(mod, &code, mod->deferred_stmts[i]);
@@ -3508,6 +3518,7 @@ OnyxWasmModule onyx_wasm_module_create(bh_allocator alloc) {
         .return_location_stack = NULL,
         .local_allocations = NULL,
         .stack_leave_patches = NULL,
+        .deferred_stmts = NULL,
 
         .stack_top_ptr = NULL,
         .stack_base_idx = 0,

diff --git a/tests/bugs/defer_block_in_macro b/tests/bugs/defer_block_in_macro
new file mode 100644 (file)
index 0000000..3224b41
--- /dev/null
+++ b/tests/bugs/defer_block_in_macro
@@ -0,0 +1,2 @@
+main took 1000 milliseconds. 1010 10
+Deferred.

diff --git a/tests/bugs/defer_block_in_macro.onyx b/tests/bugs/defer_block_in_macro.onyx
new file mode 100644 (file)
index 0000000..1073532
--- /dev/null
+++ b/tests/bugs/defer_block_in_macro.onyx
@@ -0,0 +1,22 @@
+#load "core/std"
+
+use package core
+
+test_macro :: macro () {
+    defer {
+        println("Deferred.");
+    }
+}
+
+time :: macro (name: str) {
+    start := 10;
+    defer {
+        end := 1010;
+        printf("{} took {} milliseconds. {} {}\n", name, end - start, end, start);
+    }
+}
+
+main :: (args) => {
+    test_macro();
+    time("main");
+}