aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2018-02-28 00:22:53 -0500
committerAndrew Kelley <superjoe30@gmail.com>2018-02-28 00:22:53 -0500
commit1b8a241f6fd1ac8d42965c6aaaf4934de565b2b2 (patch)
treefe663d430faa66ee31ccd815cc370cd25d1ac9ca /src
parent0f449a3ec180f710f8b54023d2c3b3dffcce5ec8 (diff)
parent90598b4631e3b68565c7d62102a9e4615514a721 (diff)
downloadzig-1b8a241f6fd1ac8d42965c6aaaf4934de565b2b2.tar.gz
zig-1b8a241f6fd1ac8d42965c6aaaf4934de565b2b2.zip
Merge branch 'fix795' of https://github.com/bnoordhuis/zig into bnoordhuis-fix795
Diffstat (limited to 'src')
-rw-r--r--src/analyze.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp
index c16a5d462a..9d5e7d77af 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -1670,6 +1670,9 @@ static void resolve_struct_type(CodeGen *g, TypeTableEntry *struct_type) {
if (struct_type->data.structure.is_invalid)
return;
+ if (struct_type->data.structure.zero_bits_loop_flag)
+ return;
+
AstNode *decl_node = struct_type->data.structure.decl_node;
if (struct_type->data.structure.embedded_in_current) {
@@ -1682,7 +1685,6 @@ static void resolve_struct_type(CodeGen *g, TypeTableEntry *struct_type) {
return;
}
- assert(!struct_type->data.structure.zero_bits_loop_flag);
assert(struct_type->data.structure.fields);
assert(decl_node->type == NodeTypeContainerDecl);