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

pass more tests

Browse Source 
by removing assertion, fixing error column,
and updating expected message
This commit is contained in:
Andrew Kelley 2017-01-05 19:25:36 -05:00
parent 28403eaad0
commit 23feafdef0
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/analyze.cpp
View File

@ -1393,8 +1393,6 @@ static void resolve_struct_type(CodeGen *g, TypeTableEntry *struct_type) {
ZigLLVMReplaceTemporary(g->dbuilder, struct_type->di_type, replacement_di_type); ZigLLVMReplaceTemporary(g->dbuilder, struct_type->di_type, replacement_di_type);
struct_type->di_type = replacement_di_type; struct_type->di_type = replacement_di_type;
assert((debug_size_in_bits == 0) == struct_type->zero_bits);
} }
static void resolve_union_type(CodeGen *g, TypeTableEntry *union_type) { static void resolve_union_type(CodeGen *g, TypeTableEntry *union_type) {

2
src/ir.cpp
View File

@ -9121,7 +9121,7 @@ static TypeTableEntry *ir_analyze_instruction_unwrap_maybe(IrAnalyze *ira,
if (type_entry->id == TypeTableEntryIdInvalid) { if (type_entry->id == TypeTableEntryIdInvalid) {
return ira->codegen->builtin_types.entry_invalid; return ira->codegen->builtin_types.entry_invalid;
} else if (type_entry->id != TypeTableEntryIdMaybe) { } else if (type_entry->id != TypeTableEntryIdMaybe) {
ir_add_error_node(ira, unwrap_maybe_instruction->base.source_node, ir_add_error_node(ira, unwrap_maybe_instruction->value->source_node,
buf_sprintf("expected nullable type, found '%s'", buf_ptr(&type_entry->name))); buf_sprintf("expected nullable type, found '%s'", buf_ptr(&type_entry->name)));
return ira->codegen->builtin_types.entry_invalid; return ira->codegen->builtin_types.entry_invalid;
} }

2
test/run_tests.cpp
View File

@ -963,7 +963,7 @@ fn f() {
fn f() { fn f() {
if (const x ?= true) { } if (const x ?= true) { }
} }
)SOURCE", 1, ".tmp_source.zig:3:20: error: expected maybe type"); )SOURCE", 1, ".tmp_source.zig:3:20: error: expected nullable type, found 'bool'");
add_compile_fail_case("cast unreachable", R"SOURCE( add_compile_fail_case("cast unreachable", R"SOURCE(
fn f() -> i32 { fn f() -> i32 {