aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2017-01-05 19:25:36 -0500
committerAndrew Kelley <superjoe30@gmail.com>2017-01-05 19:25:36 -0500
commit23feafdef0ff45e67ac63c7e220830c93b095e18 (patch)
treebfe39f0d5709d585b6d1e800ede2bf4d76b76872 /src
parent28403eaad0c4da28ff31152edbe2af659b2af500 (diff)
downloadzig-23feafdef0ff45e67ac63c7e220830c93b095e18.tar.gz
zig-23feafdef0ff45e67ac63c7e220830c93b095e18.zip
pass more tests
by removing assertion, fixing error column, and updating expected message
Diffstat (limited to 'src')
-rw-r--r--src/analyze.cpp2
-rw-r--r--src/ir.cpp2
2 files changed, 1 insertions, 3 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;
}