Commit 5749dc49d839ba607392ed0934008773d33f47d7 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-08-14 00:35:51-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-08-14 00:35:51-04:00
log	5749dc49d839ba607392ed0934008773d33f47d7
tree	09f3ca1c587f13396dc0837b252db68cfbba54bb
parent	dd8c8c080229c1f0e742fb8702687f4080d7714d
signature	Commit is signed but in an unrecognized format.

respect local variable alignment in async functions

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

src
- all_types.hpp
- analyze.cpp
test
- stage1
  - behavior
    coroutines.zig

src/all_types.hpp+1

...	@@ -1087,6 +1087,7 @@ struct TypeStructField {	...	@@ -1087,6 +1087,7 @@ struct TypeStructField {
1087	ConstExprValue *init_val; // null and then memoized	1087	ConstExprValue *init_val; // null and then memoized
1088	uint32_t bit_offset_in_host; // offset from the memory at gen_index	1088	uint32_t bit_offset_in_host; // offset from the memory at gen_index
1089	uint32_t host_int_bytes; // size of host integer	1089	uint32_t host_int_bytes; // size of host integer
		1090	uint32_t align;
1090	};	1091	};
1091		1092
1092	enum ResolveStatus {	1093	enum ResolveStatus {

src/analyze.cpp+13-5

 @@ -1524,10 +1524,11 @@ static ZigType *get_struct_type(CodeGen *g, const char *type_name, SrcField fiel
         field->name = buf_create_from_str(fields[i].name);
         field->type_entry = fields[i].ty;
         field->src_index = i;
+        field->align = fields[i].align;
         if (type_has_bits(field->type_entry)) {
             assert(type_is_resolved(field->type_entry, ResolveStatusSizeKnown));
-            unsigned field_abi_align = max(fields[i].align, field->type_entry->abi_align);
+            unsigned field_abi_align = max(field->align, field->type_entry->abi_align);
             if (field_abi_align > abi_align) {
                 abi_align = field_abi_align;
             }
 @@ -5325,7 +5326,7 @@ static Error resolve_async_frame(CodeGen *g, ZigType *frame_type) {
         }
         instruction->field_index = fields.length;
-        fields.append({name, child_type, 0});
+        fields.append({name, child_type, instruction->align});
     }
 @@ -6900,9 +6901,16 @@ static void resolve_llvm_types_struct(CodeGen *g, ZigType *struct_type, ResolveS
                 if (type_has_bits(struct_type->data.structure.fields[next_src_field_index].type_entry))
                     break;
             }
-            size_t next_abi_align = (next_src_field_index == field_count) ?
+            size_t next_abi_align;
-                struct_type->abi_align :
+            if (next_src_field_index == field_count) {
-                struct_type->data.structure.fields[next_src_field_index].type_entry->abi_align;
+                next_abi_align = struct_type->abi_align;
+            } else {
+                if (struct_type->data.structure.fields[next_src_field_index].align == 0) {
+                    next_abi_align = struct_type->data.structure.fields[next_src_field_index].type_entry->abi_align;
+                } else {
+                    next_abi_align = struct_type->data.structure.fields[next_src_field_index].align;
+                }
+            }
             size_t llvm_next_abi_align = (next_src_field_index == field_count) ?
                 llvm_struct_abi_align :
                 LLVMABIAlignmentOfType(g->target_data_ref,

test/stage1/behavior/coroutines.zig+11

...	@@ -766,3 +766,14 @@ fn testAsyncAwaitTypicalUsage(comptime simulate_fail_download: bool, comptime si	...	@@ -766,3 +766,14 @@ fn testAsyncAwaitTypicalUsage(comptime simulate_fail_download: bool, comptime si
766	}	766	}
767	};	767	};
768	}	768	}
		769
		770	test "alignment of local variables in async functions" {
		771	const S = struct {
		772	fn doTheTest() void {
		773	var y: u8 = 123;
		774	var x: u8 align(128) = 1;
		775	expect(@ptrToInt(&x) % 128 == 0);
		776	}
		777	};
		778	S.doTheTest();
		779	}