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

Fix crash with peer type resolution & error unions

Browse Source 
Fixes #3353
This commit is contained in:
LemonBoy 2019-10-20 22:56:58 +02:00 committed by Andrew Kelley
parent 771dafbaba
commit ddb87237de
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ir.cpp
View File

@ -10120,6 +10120,18 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
} else { } else {
err_set_type = cur_type; err_set_type = cur_type;
} }
if (!resolve_inferred_error_set(ira->codegen, err_set_type, cur_inst->source_node)) {
return ira->codegen->builtin_types.entry_invalid;
}
if (type_is_global_error_set(err_set_type)) {
err_set_type = ira->codegen->builtin_types.entry_global_error_set;
continue;
}
update_errors_helper(ira->codegen, &errors, &errors_count);
for (uint32_t i = 0; i < err_set_type->data.error_set.err_count; i += 1) { for (uint32_t i = 0; i < err_set_type->data.error_set.err_count; i += 1) {
ErrorTableEntry *error_entry = err_set_type->data.error_set.errors[i]; ErrorTableEntry *error_entry = err_set_type->data.error_set.errors[i];
assert(errors[error_entry->value] == nullptr); assert(errors[error_entry->value] == nullptr);

10
test/compile_errors.zig
View File

@ -2,6 +2,16 @@ 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(
"comparison with error union and error value",
\\export fn entry() void {
\\ var number_or_error: anyerror!i32 = error.SomethingAwful;
\\ _ = number_or_error == error.SomethingAwful;
\\}
,
"tmp.zig:3:25: error: operator not allowed for type 'anyerror!i32'",
);
cases.add( cases.add(
"switch with overlapping case ranges", "switch with overlapping case ranges",
\\export fn entry() void { \\export fn entry() void {