Commit bf7b6fbbdb7d28c0d7dba3e17c46ce156712cfc8 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-08-16 16:30:24-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-08-16 16:30:24-04:00
log	bf7b6fbbdb7d28c0d7dba3e17c46ce156712cfc8
tree	50ad2616948cf255982fb4138ee8757ff92b5c80
parent	cbca6586e72a8adefb3d8923d0c0f4590f54bfd8
signature	Commit is signed but in an unrecognized format.

add missing compile error for fn call bad implicit cast

when the function's return type handle is a pointer but the result
location's result value type handle is not a pointer

closes #3055

2 files changed, 55 insertions(+), 7 deletions(-)

src
- ir.cpp
test
- compile_errors.zig

src/ir.cpp+21-7

 @@ -9615,6 +9615,10 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
             return cur_type;
         }
+        if (prev_type == cur_type) {
+            continue;
+        }
         if (prev_type->id == ZigTypeIdUnreachable) {
             prev_inst = cur_inst;
             continue;
 @@ -14921,7 +14925,7 @@ static IrInstruction *ir_analyze_async_call(IrAnalyze *ira, IrInstructionCallSrc
     ZigType *frame_type = get_fn_frame_type(ira->codegen, fn_entry);
     IrInstruction *result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc,
             frame_type, nullptr, true, true, false);
-    if (result_loc != nullptr && (type_is_invalid(result_loc->value.type) || instr_is_unreachable(result_loc))) {
+    if (type_is_invalid(result_loc->value.type) || instr_is_unreachable(result_loc)) {
         return result_loc;
     }
     result_loc = ir_implicit_cast(ira, result_loc, get_pointer_to_type(ira->codegen, frame_type, false));
 @@ -15638,10 +15642,14 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
         if (handle_is_ptr(impl_fn_type_id->return_type)) {
             result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc,
                     impl_fn_type_id->return_type, nullptr, true, true, false);
-            if (result_loc != nullptr && (type_is_invalid(result_loc->value.type) ||
+            if (result_loc != nullptr) {
-                        instr_is_unreachable(result_loc)))
+                if (type_is_invalid(result_loc->value.type) || instr_is_unreachable(result_loc)) {
-            {
+                    return result_loc;
-                return result_loc;
+                }
+                if (!handle_is_ptr(result_loc->value.type->data.pointer.child_type)) {
+                    ir_reset_result(call_instruction->result_loc);
+                    result_loc = nullptr;
+                }
             }
         } else {
             result_loc = nullptr;
 @@ -15791,8 +15799,14 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
     if (handle_is_ptr(return_type)) {
         result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc,
                 return_type, nullptr, true, true, false);
-        if (result_loc != nullptr && (type_is_invalid(result_loc->value.type) || instr_is_unreachable(result_loc))) {
+        if (result_loc != nullptr) {
-            return result_loc;
+            if (type_is_invalid(result_loc->value.type) || instr_is_unreachable(result_loc)) {
+                return result_loc;
+            }
+            if (!handle_is_ptr(result_loc->value.type->data.pointer.child_type)) {
+                ir_reset_result(call_instruction->result_loc);
+                result_loc = nullptr;
+            }
         }
     } else {
         result_loc = nullptr;

test/compile_errors.zig+34

...	@@ -2,6 +2,40 @@ const tests = @import("tests.zig");	...	@@ -2,6 +2,40 @@ const tests = @import("tests.zig");
2	const builtin = @import("builtin");	2	const builtin = @import("builtin");
3		3
4	pub fn addCases(cases: *tests.CompileErrorContext) void {	4	pub fn addCases(cases: *tests.CompileErrorContext) void {
		5	cases.add(
		6	"result location incompatibility mismatching handle_is_ptr (generic call)",
		7	\\export fn entry() void {
		8	\\ var damn = Container{
		9	\\ .not_optional = getOptional(i32),
		10	\\ };
		11	\\}
		12	\\pub fn getOptional(comptime T: type) ?T {
		13	\\ return 0;
		14	\\}
		15	\\pub const Container = struct {
		16	\\ not_optional: i32,
		17	\\};
		18	,
		19	"tmp.zig:3:36: error: expected type 'i32', found '?i32'",
		20	);
		21
		22	cases.add(
		23	"result location incompatibility mismatching handle_is_ptr",
		24	\\export fn entry() void {
		25	\\ var damn = Container{
		26	\\ .not_optional = getOptional(),
		27	\\ };
		28	\\}
		29	\\pub fn getOptional() ?i32 {
		30	\\ return 0;
		31	\\}
		32	\\pub const Container = struct {
		33	\\ not_optional: i32,
		34	\\};
		35	,
		36	"tmp.zig:3:36: error: expected type 'i32', found '?i32'",
		37	);
		38
5	cases.add(	39	cases.add(
6	"const frame cast to anyframe",	40	"const frame cast to anyframe",
7	\\export fn a() void {	41	\\export fn a() void {