Commit d577dde636173e5ec799e67ead32722ac59148db | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-04-02 18:11:53-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-04-02 18:31:19-04:00
log	d577dde636173e5ec799e67ead32722ac59148db
tree	4ffce779348936b20e1e83db5b500045560af64d
parent	9780fd59f063d23e69ceadf4305453531b704c11
signature	Commit is signed but in an unrecognized format.

passing all tests

2 files changed, 5 insertions(+), 2 deletions(-)

src
- analyze.cpp
- codegen.cpp

src/analyze.cpp+2-2

...	@@ -1731,7 +1731,7 @@ static Error resolve_union_alignment(CodeGen g, ZigType union_type) {	...	@@ -1731,7 +1731,7 @@ static Error resolve_union_alignment(CodeGen g, ZigType union_type) {
1731	union_type->data.unionation.reported_infinite_err = true;	1731	union_type->data.unionation.reported_infinite_err = true;
1732	union_type->data.unionation.resolve_status = ResolveStatusInvalid;	1732	union_type->data.unionation.resolve_status = ResolveStatusInvalid;
1733	ErrorMsg *msg = add_node_error(g, decl_node,	1733	ErrorMsg *msg = add_node_error(g, decl_node,
1734	buf_sprintf("union '%s' depends on its own alignment", buf_ptr(&union_type->name)));	1734	buf_sprintf("union '%s' contains itself", buf_ptr(&union_type->name)));
1735	emit_error_notes_for_ref_stack(g, msg);	1735	emit_error_notes_for_ref_stack(g, msg);
1736	}	1736	}
1737	return ErrorSemanticAnalyzeFail;	1737	return ErrorSemanticAnalyzeFail;
...	@@ -2225,7 +2225,7 @@ static Error resolve_struct_alignment(CodeGen g, ZigType struct_type) {	...	@@ -2225,7 +2225,7 @@ static Error resolve_struct_alignment(CodeGen g, ZigType struct_type) {
2225	if (struct_type->data.structure.resolve_status != ResolveStatusInvalid) {	2225	if (struct_type->data.structure.resolve_status != ResolveStatusInvalid) {
2226	struct_type->data.structure.resolve_status = ResolveStatusInvalid;	2226	struct_type->data.structure.resolve_status = ResolveStatusInvalid;
2227	ErrorMsg *msg = add_node_error(g, decl_node,	2227	ErrorMsg *msg = add_node_error(g, decl_node,
2228	buf_sprintf("struct '%s' depends on its own alignment", buf_ptr(&struct_type->name)));	2228	buf_sprintf("struct '%s' contains itself", buf_ptr(&struct_type->name)));
2229	emit_error_notes_for_ref_stack(g, msg);	2229	emit_error_notes_for_ref_stack(g, msg);
2230	}	2230	}
2231	return ErrorSemanticAnalyzeFail;	2231	return ErrorSemanticAnalyzeFail;

src/codegen.cpp+3

 @@ -6737,6 +6737,9 @@ static void do_code_gen(CodeGen *g) {
         if (have_err_ret_trace_stack) {
             ZigType *array_type = get_array_type(g, g->builtin_types.entry_usize, stack_trace_ptr_count);
             err_ret_array_val = build_alloca(g, array_type, "error_return_trace_addresses", get_abi_alignment(g, array_type));
+            // populate g->stack_trace_type
+            (void)get_ptr_to_stack_trace_type(g);
             g->cur_err_ret_trace_val_stack = build_alloca(g, g->stack_trace_type, "error_return_trace", get_abi_alignment(g, g->stack_trace_type));
         } else {
             g->cur_err_ret_trace_val_stack = nullptr;