Commit e11cafbd4f11fa5eae0cbdf03854291834b4cd77 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-08-07 10:56:37-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-08-07 10:56:37-04:00
log	e11cafbd4f11fa5eae0cbdf03854291834b4cd77
tree	92587f54fbc5aebb46f5081e5086c76c0284cac0
parent	f587fa1cd73c3c0382e1bd2da2e24a7473421a2c
signature	Commit is signed but in an unrecognized format.

cancel works on non-pointers

2 files changed, 29 insertions(+), 3 deletions(-)

src
- ir.cpp
test
- stage1
  - behavior
    cancel.zig

src/ir.cpp+13-3

 @@ -7845,7 +7845,7 @@ static IrInstruction *ir_gen_cancel(IrBuilder *irb, Scope *scope, AstNode *node)
         return irb->codegen->invalid_instruction;
     }
-    IrInstruction *operand = ir_gen_node(irb, node->data.cancel_expr.expr, scope);
+    IrInstruction *operand = ir_gen_node_extra(irb, node->data.cancel_expr.expr, scope, LValPtr, nullptr);
     if (operand == irb->codegen->invalid_instruction)
         return irb->codegen->invalid_instruction;
 @@ -24496,10 +24496,20 @@ static IrInstruction *ir_analyze_instruction_suspend_finish(IrAnalyze *ira,
 }
 static IrInstruction *ir_analyze_instruction_cancel(IrAnalyze *ira, IrInstructionCancel *instruction) {
-    IrInstruction *frame = instruction->frame->child;
+    IrInstruction *frame_ptr = instruction->frame->child;
-    if (type_is_invalid(frame->value.type))
+    if (type_is_invalid(frame_ptr->value.type))
         return ira->codegen->invalid_instruction;
+    IrInstruction *frame;
+    if (frame_ptr->value.type->id == ZigTypeIdPointer &&
+        frame_ptr->value.type->data.pointer.ptr_len == PtrLenSingle &&
+        frame_ptr->value.type->data.pointer.child_type->id == ZigTypeIdCoroFrame)
+    {
+        frame = frame_ptr;
+    } else {
+        frame = ir_get_deref(ira, &instruction->base, frame_ptr, nullptr);
+    }
     ZigType *any_frame_type = get_any_frame_type(ira->codegen, nullptr);
     IrInstruction *casted_frame = ir_implicit_cast(ira, frame, any_frame_type);
     if (type_is_invalid(casted_frame->value.type))

test/stage1/behavior/cancel.zig+16

...	@@ -92,3 +92,19 @@ async fn b4() void {	...	@@ -92,3 +92,19 @@ async fn b4() void {
92	}	92	}
93	suspend;	93	suspend;
94	}	94	}
		95
		96	test "cancel on a non-pointer" {
		97	const S = struct {
		98	fn doTheTest() void {
		99	_ = async atest();
		100	}
		101	fn atest() void {
		102	var f = async func();
		103	cancel f;
		104	}
		105	fn func() void {
		106	suspend;
		107	}
		108	};
		109	S.doTheTest();
		110	}