From 8a0e1d4c02480809fe7ab9ee40ce279ffcb4fd16 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Thu, 1 Mar 2018 15:46:35 -0500
Subject: await keyword works

---
 src/all_types.hpp |  3 ++-
 src/ir.cpp        | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/all_types.hpp b/src/all_types.hpp
index 503d45fd9b..72ec860556 100644
--- a/src/all_types.hpp
+++ b/src/all_types.hpp
@@ -58,8 +58,9 @@ struct IrExecutable {
     ZigList<Tld *> tld_list;
 
     IrInstruction *coro_handle;
-    IrInstruction *coro_awaiter_field_ptr;
+    IrInstruction *coro_awaiter_field_ptr; // this one is shared and in the promise
     IrInstruction *coro_result_ptr_field_ptr;
+    IrInstruction *await_handle_var_ptr; // this one is where we put the one we extracted from the promise
     IrBasicBlock *coro_early_final;
     IrBasicBlock *coro_normal_final;
     IrBasicBlock *coro_suspend_block;
diff --git a/src/ir.cpp b/src/ir.cpp
index 51c75ca23b..9a01b152d8 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -2752,6 +2752,7 @@ static IrInstruction *ir_gen_async_return(IrBuilder *irb, Scope *scope, AstNode
     IrInstruction *maybe_await_handle = ir_build_atomic_rmw(irb, scope, node,
             promise_type_val, irb->exec->coro_awaiter_field_ptr, nullptr, replacement_value, nullptr,
             AtomicRmwOp_xchg, AtomicOrderSeqCst);
+    ir_build_store_ptr(irb, scope, node, irb->exec->await_handle_var_ptr, maybe_await_handle);
     IrInstruction *is_non_null = ir_build_test_nonnull(irb, scope, node, maybe_await_handle);
     IrInstruction *is_comptime = ir_build_const_bool(irb, scope, node, false);
     return ir_build_cond_br(irb, scope, node, is_non_null, irb->exec->coro_normal_final, irb->exec->coro_early_final,
@@ -6020,7 +6021,6 @@ static IrInstruction *ir_gen_await_expr(IrBuilder *irb, Scope *parent_scope, Ast
     ir_build_br(irb, parent_scope, node, merge_block, const_bool_false);
 
     ir_set_cursor_at_end_and_append_block(irb, yes_suspend_block);
-    ir_build_coro_resume(irb, parent_scope, node, target_inst);
     IrInstruction *suspend_code = ir_build_coro_suspend(irb, parent_scope, node, save_token, const_bool_false);
     IrBasicBlock *cleanup_block = ir_create_basic_block(irb, parent_scope, "SuspendCleanup");
     IrBasicBlock *resume_block = ir_create_basic_block(irb, parent_scope, "SuspendResume");
@@ -6277,13 +6277,20 @@ bool ir_gen(CodeGen *codegen, AstNode *node, Scope *scope, IrExecutable *ir_exec
         // create the coro promise
         const_bool_false = ir_build_const_bool(irb, scope, node, false);
         VariableTableEntry *promise_var = ir_create_var(irb, node, scope, nullptr, false, false, true, const_bool_false);
-        //scope = promise_var->child_scope;
 
         return_type = fn_entry->type_entry->data.fn.fn_type_id.return_type;
         IrInstruction *promise_init = ir_build_const_promise_init(irb, scope, node, return_type);
         ir_build_var_decl(irb, scope, node, promise_var, nullptr, nullptr, promise_init);
         IrInstruction *coro_promise_ptr = ir_build_var_ptr(irb, scope, node, promise_var, false, false);
 
+        VariableTableEntry *await_handle_var = ir_create_var(irb, node, scope, nullptr, false, false, true, const_bool_false);
+        IrInstruction *null_value = ir_build_const_null(irb, scope, node);
+        IrInstruction *await_handle_type_val = ir_build_const_type(irb, scope, node,
+                get_maybe_type(irb->codegen, irb->codegen->builtin_types.entry_promise));
+        ir_build_var_decl(irb, scope, node, await_handle_var, await_handle_type_val, nullptr, null_value);
+        irb->exec->await_handle_var_ptr = ir_build_var_ptr(irb, scope, node,
+                await_handle_var, false, false);
+
         u8_ptr_type = ir_build_const_type(irb, scope, node,
                 get_pointer_to_type(irb->codegen, irb->codegen->builtin_types.entry_u8, false));
         IrInstruction *promise_as_u8_ptr = ir_build_ptr_cast(irb, scope, node, u8_ptr_type, coro_promise_ptr);
@@ -6409,7 +6416,7 @@ bool ir_gen(CodeGen *codegen, AstNode *node, Scope *scope, IrExecutable *ir_exec
 
         ir_set_cursor_at_end_and_append_block(irb, resume_block);
         IrInstruction *unwrapped_await_handle_ptr = ir_build_unwrap_maybe(irb, scope, node,
-                irb->exec->coro_awaiter_field_ptr, false);
+                irb->exec->await_handle_var_ptr, false);
         IrInstruction *awaiter_handle = ir_build_load_ptr(irb, scope, node, unwrapped_await_handle_ptr);
         ir_build_coro_resume(irb, scope, node, awaiter_handle);
         ir_build_br(irb, scope, node, irb->exec->coro_suspend_block, const_bool_false);
-- 
cgit v1.2.3