fix coroutines

3 files changed, 11 insertions, 5 deletions

diff --git a/src/codegen.cpp b/src/codegen.cpp
index 5cb65b38f3..79c92964f6 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -3755,7 +3755,7 @@ static LLVMValueRef ir_render_call(CodeGen *g, IrExecutable *executable, IrInstr
     bool prefix_arg_err_ret_stack = get_prefix_arg_err_ret_stack(g, fn_type_id);
     bool is_var_args = fn_type_id->is_var_args;
     ZigList<LLVMValueRef> gen_param_values = {};
-    LLVMValueRef result_loc = first_arg_ret ? ir_llvm_value(g, instruction->result_loc) : nullptr;
+    LLVMValueRef result_loc = (first_arg_ret || instruction->is_async) ? ir_llvm_value(g, instruction->result_loc) : nullptr;
     if (first_arg_ret) {
         gen_param_values.append(result_loc);
     }
diff --git a/src/ir.cpp b/src/ir.cpp
index 4dbc20cf48..c3ed14770f 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -15252,8 +15252,14 @@ static IrInstruction *ir_analyze_async_call(IrAnalyze *ira, IrInstructionCallSrc
     ZigType *promise_type = get_promise_type(ira->codegen, return_type);
     ZigType *async_return_type = get_error_union_type(ira->codegen, alloc_fn_error_set_type, promise_type);
 
+    IrInstruction *result_loc = ir_resolve_result(ira, &call_instruction->base, no_result_loc(),
+            async_return_type, nullptr, true, true);
+    if (type_is_invalid(result_loc->value.type) || instr_is_unreachable(result_loc)) {
+        return result_loc;
+    }
+
     return ir_build_call_gen(ira, &call_instruction->base, fn_entry, fn_ref, arg_count,
-            casted_args, FnInlineAuto, true, async_allocator_inst, nullptr, nullptr,
+            casted_args, FnInlineAuto, true, async_allocator_inst, nullptr, result_loc,
             async_return_type);
 }
 
diff --git a/test/stage1/behavior.zig b/test/stage1/behavior.zig
index 8fcd9b86b8..f477bb64ed 100644
--- a/test/stage1/behavior.zig
+++ b/test/stage1/behavior.zig
@@ -39,11 +39,11 @@ comptime {
     _ = @import("behavior/bugs/828.zig");
     _ = @import("behavior/bugs/920.zig");
     _ = @import("behavior/byval_arg_var.zig");
-    //_ = @import("behavior/cancel.zig");
+    _ = @import("behavior/cancel.zig");
     _ = @import("behavior/cast.zig");
     _ = @import("behavior/const_slice_child.zig");
-    //_ = @import("behavior/coroutine_await_struct.zig");
-    //_ = @import("behavior/coroutines.zig");
+    _ = @import("behavior/coroutine_await_struct.zig");
+    _ = @import("behavior/coroutines.zig");
     _ = @import("behavior/defer.zig");
     _ = @import("behavior/enum.zig");
     _ = @import("behavior/enum_with_members.zig");