authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2015-12-22 13:41:33-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2015-12-22 13:41:33-07:00
logfe3ad27d5f909fbe1e4d6f863dcf5f69b7dc6507
treec77d1f34c754f0717ab76f54f1b987b1c5ae295a
parent431170d981edf1eba790cefe0f27a6142634ea1d

analyze: error for infinite size struct

3 files changed, 25 insertions(+), 1 deletions(-)

src/analyze.cpp+12-1
...@@ -273,12 +273,19 @@ static void preview_function_labels(CodeGen *g, AstNode *node, FnTableEntry *fn_...@@ -273,12 +273,19 @@ static void preview_function_labels(CodeGen *g, AstNode *node, FnTableEntry *fn_
273static void resolve_struct_type(CodeGen *g, ImportTableEntry *import, TypeTableEntry *struct_type) {273static void resolve_struct_type(CodeGen *g, ImportTableEntry *import, TypeTableEntry *struct_type) {
274 assert(struct_type->id == TypeTableEntryIdStruct);274 assert(struct_type->id == TypeTableEntryIdStruct);
275275
276 AstNode *decl_node = struct_type->data.structure.decl_node;
277
278 if (struct_type->data.structure.embedded_in_current) {
279 add_node_error(g, decl_node,
280 buf_sprintf("struct has infinite size"));
281 return;
282 }
283
276 if (struct_type->data.structure.fields) {284 if (struct_type->data.structure.fields) {
277 // we already resolved this type. skip285 // we already resolved this type. skip
278 return;286 return;
279 }287 }
280288
281 AstNode *decl_node = struct_type->data.structure.decl_node;
282289
283 assert(struct_type->di_type);290 assert(struct_type->di_type);
284291
...@@ -293,6 +300,9 @@ static void resolve_struct_type(CodeGen *g, ImportTableEntry *import, TypeTableE...@@ -293,6 +300,9 @@ static void resolve_struct_type(CodeGen *g, ImportTableEntry *import, TypeTableE
293 uint64_t first_field_align_in_bits = 0;300 uint64_t first_field_align_in_bits = 0;
294 uint64_t offset_in_bits = 0;301 uint64_t offset_in_bits = 0;
295302
303 // this field should be set to true only during the recursive calls to resolve_struct_type
304 struct_type->data.structure.embedded_in_current = true;
305
296 for (int i = 0; i < field_count; i += 1) {306 for (int i = 0; i < field_count; i += 1) {
297 AstNode *field_node = decl_node->data.struct_decl.fields.at(i);307 AstNode *field_node = decl_node->data.struct_decl.fields.at(i);
298 TypeStructField *type_struct_field = &struct_type->data.structure.fields[i];308 TypeStructField *type_struct_field = &struct_type->data.structure.fields[i];
...@@ -321,6 +331,7 @@ static void resolve_struct_type(CodeGen *g, ImportTableEntry *import, TypeTableE...@@ -321,6 +331,7 @@ static void resolve_struct_type(CodeGen *g, ImportTableEntry *import, TypeTableE
321 offset_in_bits += type_struct_field->type_entry->size_in_bits;331 offset_in_bits += type_struct_field->type_entry->size_in_bits;
322332
323 }333 }
334 struct_type->data.structure.embedded_in_current = false;
324335
325 LLVMStructSetBody(struct_type->type_ref, element_types, field_count, false);336 LLVMStructSetBody(struct_type->type_ref, element_types, field_count, false);
326337
src/analyze.hpp+3
...@@ -43,6 +43,9 @@ struct TypeTableEntryStruct {...@@ -43,6 +43,9 @@ struct TypeTableEntryStruct {
43 bool is_packed;43 bool is_packed;
44 int field_count;44 int field_count;
45 TypeStructField *fields;45 TypeStructField *fields;
46
47 // set this flag temporarily to detect infinite loops
48 bool embedded_in_current;
46};49};
4750
48struct TypeTableEntryNumLit {51struct TypeTableEntryNumLit {
test/run_tests.cpp+10
...@@ -828,6 +828,16 @@ fn f() {...@@ -828,6 +828,16 @@ fn f() {
828}828}
829 )SOURCE", 2, ".tmp_source.zig:3:21: error: expected type 'i32', got 'void'",829 )SOURCE", 2, ".tmp_source.zig:3:21: error: expected type 'i32', got 'void'",
830 ".tmp_source.zig:4:15: error: incompatible types: 'i32' and 'void'");830 ".tmp_source.zig:4:15: error: incompatible types: 'i32' and 'void'");
831
832 add_compile_fail_case("direct struct loop", R"SOURCE(
833struct A { a : A, }
834 )SOURCE", 1, ".tmp_source.zig:2:1: error: struct has infinite size");
835
836 add_compile_fail_case("indirect struct loop", R"SOURCE(
837struct A { b : B, }
838struct B { c : C, }
839struct C { a : A, }
840 )SOURCE", 1, ".tmp_source.zig:2:1: error: struct has infinite size");
831}841}
832842
833static void print_compiler_invocation(TestCase *test_case) {843static void print_compiler_invocation(TestCase *test_case) {