Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add missing compile error for fn call bad implicit cast

Browse Source 
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
This commit is contained in:
Andrew Kelley 2019-08-16 16:30:24 -04:00
parent cbca6586e7
commit bf7b6fbbdb
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ir.cpp
View File

@ -9615,6 +9615,10 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
return cur_type; return cur_type;
} }
if (prev_type == cur_type) {
continue;
}
if (prev_type->id == ZigTypeIdUnreachable) { if (prev_type->id == ZigTypeIdUnreachable) {
prev_inst = cur_inst; prev_inst = cur_inst;
continue; 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); 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, IrInstruction *result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc,
frame_type, nullptr, true, true, false); 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; return result_loc;
} }
result_loc = ir_implicit_cast(ira, result_loc, get_pointer_to_type(ira->codegen, frame_type, false)); result_loc = ir_implicit_cast(ira, result_loc, get_pointer_to_type(ira->codegen, frame_type, false));
@ -15638,11 +15642,15 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
if (handle_is_ptr(impl_fn_type_id->return_type)) { if (handle_is_ptr(impl_fn_type_id->return_type)) {
result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc, result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc,
impl_fn_type_id->return_type, nullptr, true, true, false); 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 { } else {
result_loc = nullptr; result_loc = nullptr;
} }
@ -15791,9 +15799,15 @@ static IrInstruction *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCallSrc *c
if (handle_is_ptr(return_type)) { if (handle_is_ptr(return_type)) {
result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc, result_loc = ir_resolve_result(ira, &call_instruction->base, call_instruction->result_loc,
return_type, nullptr, true, true, false); 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) {
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 { } else {
result_loc = nullptr; result_loc = nullptr;
} }

34
test/compile_errors.zig
View File

@ -2,6 +2,40 @@ const tests = @import("tests.zig");
const builtin = @import("builtin"); const builtin = @import("builtin");
pub fn addCases(cases: *tests.CompileErrorContext) void { pub fn addCases(cases: *tests.CompileErrorContext) void {
cases.add(
"result location incompatibility mismatching handle_is_ptr (generic call)",
\\export fn entry() void {
\\ var damn = Container{
\\ .not_optional = getOptional(i32),
\\ };
\\}
\\pub fn getOptional(comptime T: type) ?T {
\\ return 0;
\\}
\\pub const Container = struct {
\\ not_optional: i32,
\\};
,
"tmp.zig:3:36: error: expected type 'i32', found '?i32'",
);
cases.add(
"result location incompatibility mismatching handle_is_ptr",
\\export fn entry() void {
\\ var damn = Container{
\\ .not_optional = getOptional(),
\\ };
\\}
\\pub fn getOptional() ?i32 {
\\ return 0;
\\}
\\pub const Container = struct {
\\ not_optional: i32,
\\};
,
"tmp.zig:3:36: error: expected type 'i32', found '?i32'",
);
cases.add( cases.add(
"const frame cast to anyframe", "const frame cast to anyframe",
\\export fn a() void { \\export fn a() void {