Commit b91eaba38c6661b5eb3558b0c0b88a22a50d2a57 | zig

author	LemonBoy <thatlemon@gmail.com> 2020-01-02 23:56:14+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-01-03 17:41:55-05:00
log	b91eaba38c6661b5eb3558b0c0b88a22a50d2a57
tree	da720b471378adace5db8901323b1fac55bb831c
parent	3f19bc5d01ffd669dae09c0696613cc8f9656e34

Correct evaluation of optional type alignment

The lazy logic was too oversimplified and produced a different result
than the one computed later causing all kinds of problems.

Closes #4013

4 files changed, 20 insertions(+), 10 deletions(-)

src
test
- stage1
  - behavior
    optional.zig

src/analyze.cpp+9-7

 @@ -1331,7 +1331,7 @@ start_over:
     zig_unreachable();
 }
-Error type_val_resolve_abi_align(CodeGen *g, ZigValue *type_val, uint32_t *abi_align) {
+Error type_val_resolve_abi_align(CodeGen *g, AstNode *source_node, ZigValue *type_val, uint32_t *abi_align) {
     Error err;
     if (type_val->special != ConstValSpecialLazy) {
         assert(type_val->special == ConstValSpecialStatic);
 @@ -1356,19 +1356,21 @@ Error type_val_resolve_abi_align(CodeGen *g, ZigValue *type_val, uint32_t *abi_a
             *abi_align = g->builtin_types.entry_usize->abi_align;
             return ErrorNone;
         case LazyValueIdOptType: {
-            LazyValueOptType *lazy_opt_type = reinterpret_cast<LazyValueOptType *>(type_val->data.x_lazy);
+            if ((err = ir_resolve_lazy(g, nullptr, type_val)))
-            return type_val_resolve_abi_align(g, lazy_opt_type->payload_type->value, abi_align);
+                return err;
+            return type_val_resolve_abi_align(g, source_node, type_val, abi_align);
         }
         case LazyValueIdArrayType: {
             LazyValueArrayType *lazy_array_type =
                 reinterpret_cast<LazyValueArrayType *>(type_val->data.x_lazy);
-            return type_val_resolve_abi_align(g, lazy_array_type->elem_type->value, abi_align);
+            return type_val_resolve_abi_align(g, source_node, lazy_array_type->elem_type->value, abi_align);
         }
         case LazyValueIdErrUnionType: {
             LazyValueErrUnionType *lazy_err_union_type =
                 reinterpret_cast<LazyValueErrUnionType *>(type_val->data.x_lazy);
             uint32_t payload_abi_align;
-            if ((err = type_val_resolve_abi_align(g, lazy_err_union_type->payload_type->value,
+            if ((err = type_val_resolve_abi_align(g, source_node, lazy_err_union_type->payload_type->value,
                             &payload_abi_align)))
             {
                 return err;
 @@ -2335,7 +2337,7 @@ static Error resolve_union_alignment(CodeGen *g, ZigType *union_type) {
             }
             field->align = field->type_entry->abi_align;
         } else {
-            if ((err = type_val_resolve_abi_align(g, field->type_val, &field->align))) {
+            if ((err = type_val_resolve_abi_align(g, field->decl_node, field->type_val, &field->align))) {
                 if (g->trace_err != nullptr) {
                     g->trace_err = add_error_note(g, g->trace_err, field->decl_node,
                         buf_create_from_str("while checking this field"));
 @@ -2912,7 +2914,7 @@ static Error resolve_struct_alignment(CodeGen *g, ZigType *struct_type) {
         } else if (packed) {
             field->align = 1;
         } else {
-            if ((err = type_val_resolve_abi_align(g, field->type_val, &field->align))) {
+            if ((err = type_val_resolve_abi_align(g, field->decl_node, field->type_val, &field->align))) {
                 if (g->trace_err != nullptr) {
                     g->trace_err = add_error_note(g, g->trace_err, field->decl_node,
                         buf_create_from_str("while checking this field"));

src/analyze.hpp+1-1

...	@@ -260,7 +260,7 @@ ZigValue analyze_const_value(CodeGen g, Scope scope, AstNode node, ZigType *	...	@@ -260,7 +260,7 @@ ZigValue analyze_const_value(CodeGen g, Scope scope, AstNode node, ZigType *
260	void resolve_llvm_types_fn(CodeGen g, ZigFn fn);	260	void resolve_llvm_types_fn(CodeGen g, ZigFn fn);
261	bool fn_is_async(ZigFn *fn);	261	bool fn_is_async(ZigFn *fn);
262		262
263	Error type_val_resolve_abi_align(CodeGen g, ZigValue type_val, uint32_t *abi_align);	263	Error type_val_resolve_abi_align(CodeGen g, AstNode source_node, ZigValue type_val, uint32_t abi_align);
264	Error type_val_resolve_abi_size(CodeGen g, AstNode source_node, ZigValue *type_val,	264	Error type_val_resolve_abi_size(CodeGen g, AstNode source_node, ZigValue *type_val,
265	size_t abi_size, size_t size_in_bits);	265	size_t abi_size, size_t size_in_bits);
266	Error type_val_resolve_zero_bits(CodeGen g, ZigValue type_val, ZigType *parent_type,	266	Error type_val_resolve_zero_bits(CodeGen g, ZigValue type_val, ZigType *parent_type,

src/ir.cpp+2-2

...	@@ -29200,8 +29200,8 @@ static Error ir_resolve_lazy_raw(AstNode source_node, ZigValue val) {	...	@@ -29200,8 +29200,8 @@ static Error ir_resolve_lazy_raw(AstNode source_node, ZigValue val) {
29200	}	29200	}
29201		29201
29202	uint32_t align_in_bytes;	29202	uint32_t align_in_bytes;
29203	if ((err = type_val_resolve_abi_align(ira->codegen, lazy_align_of->target_type->value,	29203	if ((err = type_val_resolve_abi_align(ira->codegen, source_node,
29204	&align_in_bytes)))	29204	lazy_align_of->target_type->value, &align_in_bytes)))
29205	{	29205	{
29206	return err;	29206	return err;
29207	}	29207	}

test/stage1/behavior/optional.zig+8

...	@@ -145,3 +145,11 @@ test "coerce an anon struct literal to optional struct" {	...	@@ -145,3 +145,11 @@ test "coerce an anon struct literal to optional struct" {
145	S.doTheTest();	145	S.doTheTest();
146	comptime S.doTheTest();	146	comptime S.doTheTest();
147	}	147	}
		148
		149	test "optional with void type" {
		150	const Foo = struct {
		151	x: ?void,
		152	};
		153	var x = Foo{ .x = null };
		154	expect(x.x == null);
		155	}