Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix variables which are pointers to packed struct fields

Browse Source 
closes #1121
This commit is contained in:
Andrew Kelley 2018-09-26 14:54:07 -04:00
parent dcfd15a7f0
commit 589201b104
No known key found for this signature in database
GPG Key ID: 4E7CD66038A4D47C
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/analyze.cpp
View File

@ -489,20 +489,27 @@ ZigType *get_pointer_to_type_extra(CodeGen *g, ZigType *child_type, bool is_cons
entry->zero_bits = !type_has_bits(child_type);
if (!entry->zero_bits) {
if (is_const || is_volatile || host_int_bytes != 0 || byte_alignment != 0 ||
ptr_len != PtrLenSingle)
{
ZigType *peer_type = get_pointer_to_type(g, child_type, false);
if (is_const || is_volatile || byte_alignment != 0 || ptr_len != PtrLenSingle || bit_offset_in_host != 0) {
ZigType *peer_type = get_pointer_to_type_extra(g, child_type, false, false,
PtrLenSingle, 0, 0, host_int_bytes);
entry->type_ref = peer_type->type_ref;
entry->di_type = peer_type->di_type;
} else {
if (host_int_bytes == 0) {
entry->type_ref = LLVMPointerType(child_type->type_ref, 0);
uint64_t debug_size_in_bits = 8*LLVMStoreSizeOfType(g->target_data_ref, entry->type_ref);
uint64_t debug_align_in_bits = 8*LLVMABIAlignmentOfType(g->target_data_ref, entry->type_ref);
assert(child_type->di_type);
entry->di_type = ZigLLVMCreateDebugPointerType(g->dbuilder, child_type->di_type,
debug_size_in_bits, debug_align_in_bits, buf_ptr(&entry->name));
} else {
ZigType *host_int_type = get_int_type(g, false, host_int_bytes * 8);
entry->type_ref = LLVMPointerType(host_int_type->type_ref, 0);
uint64_t debug_size_in_bits = 8*LLVMStoreSizeOfType(g->target_data_ref, host_int_type->type_ref);
uint64_t debug_align_in_bits = 8*LLVMABIAlignmentOfType(g->target_data_ref, host_int_type->type_ref);
entry->di_type = ZigLLVMCreateDebugPointerType(g->dbuilder, host_int_type->di_type,
debug_size_in_bits, debug_align_in_bits, buf_ptr(&entry->name));
}
}
} else {
assert(byte_alignment == 0);

13
test/cases/struct.zig
View File

@ -453,3 +453,16 @@ test "implicit cast packed struct field to const ptr" {
const res = LevelUpMove.toInt(lup.level);
assert(res == 12);
}
test "pointer to packed struct member in a stack variable" {
const S = packed struct {
a: u2,
b: u2,
};
var s = S{ .a = 2, .b = 0 };
var b_ptr = &s.b;
assert(s.b == 0);
b_ptr.* = 2;
assert(s.b == 2);
}