diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-01-05 19:25:36 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-01-05 19:25:36 -0500 |
| commit | 23feafdef0ff45e67ac63c7e220830c93b095e18 (patch) | |
| tree | bfe39f0d5709d585b6d1e800ede2bf4d76b76872 | |
| parent | 28403eaad0c4da28ff31152edbe2af659b2af500 (diff) | |
| download | zig-23feafdef0ff45e67ac63c7e220830c93b095e18.tar.gz zig-23feafdef0ff45e67ac63c7e220830c93b095e18.zip | |
pass more tests
by removing assertion, fixing error column,
and updating expected message
| -rw-r--r-- | src/analyze.cpp | 2 | ||||
| -rw-r--r-- | src/ir.cpp | 2 | ||||
| -rw-r--r-- | test/run_tests.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp index ac9563c8a3..1c9ddb7e2e 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -1393,8 +1393,6 @@ static void resolve_struct_type(CodeGen *g, TypeTableEntry *struct_type) { ZigLLVMReplaceTemporary(g->dbuilder, 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) { diff --git a/src/ir.cpp b/src/ir.cpp index 824c3ec2a1..fa270e5f3a 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -9121,7 +9121,7 @@ static TypeTableEntry *ir_analyze_instruction_unwrap_maybe(IrAnalyze *ira, if (type_entry->id == TypeTableEntryIdInvalid) { return ira->codegen->builtin_types.entry_invalid; } 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))); return ira->codegen->builtin_types.entry_invalid; } diff --git a/test/run_tests.cpp b/test/run_tests.cpp index 2a2d4d640a..97f0c2a788 100644 --- a/test/run_tests.cpp +++ b/test/run_tests.cpp @@ -963,7 +963,7 @@ fn f() { fn f() { 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( fn f() -> i32 { |