diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-08-29 15:19:15 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-08-29 15:19:15 -0400 |
| commit | be94299666e57486be6bdb8fee2b79dbf3623c5d (patch) | |
| tree | e0a04a80df130e5aee55b6cfa5d309821fbd8e97 /src | |
| parent | 8f682efbc5abf4d631f60310f95b998c6fe44669 (diff) | |
| download | zig-be94299666e57486be6bdb8fee2b79dbf3623c5d.tar.gz zig-be94299666e57486be6bdb8fee2b79dbf3623c5d.zip | |
prevent implicitly increasing pointer alignment
See #37
Diffstat (limited to 'src')
| -rw-r--r-- | src/analyze.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp index c6e0c28b90..69a50253d2 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -2615,25 +2615,30 @@ bool types_match_const_cast_only(TypeTableEntry *expected_type, TypeTableEntry * (!actual_type->data.pointer.is_const || expected_type->data.pointer.is_const) && (!actual_type->data.pointer.is_volatile || expected_type->data.pointer.is_volatile) && actual_type->data.pointer.bit_offset == expected_type->data.pointer.bit_offset && - actual_type->data.pointer.unaligned_bit_count == expected_type->data.pointer.unaligned_bit_count) + actual_type->data.pointer.unaligned_bit_count == expected_type->data.pointer.unaligned_bit_count && + actual_type->data.pointer.alignment >= expected_type->data.pointer.alignment) { return types_match_const_cast_only(expected_type->data.pointer.child_type, actual_type->data.pointer.child_type); } - // unknown size array const + // slice const if (expected_type->id == TypeTableEntryIdStruct && actual_type->id == TypeTableEntryIdStruct && expected_type->data.structure.is_slice && - actual_type->data.structure.is_slice && - (!actual_type->data.structure.fields[slice_ptr_index].type_entry->data.pointer.is_const || - expected_type->data.structure.fields[slice_ptr_index].type_entry->data.pointer.is_const) && - (!actual_type->data.structure.fields[slice_ptr_index].type_entry->data.pointer.is_volatile || - expected_type->data.structure.fields[slice_ptr_index].type_entry->data.pointer.is_volatile)) + actual_type->data.structure.is_slice) { - return types_match_const_cast_only( - expected_type->data.structure.fields[slice_ptr_index].type_entry->data.pointer.child_type, - actual_type->data.structure.fields[slice_ptr_index].type_entry->data.pointer.child_type); + TypeTableEntry *actual_ptr_type = actual_type->data.structure.fields[slice_ptr_index].type_entry; + TypeTableEntry *expected_ptr_type = expected_type->data.structure.fields[slice_ptr_index].type_entry; + if ((!actual_ptr_type->data.pointer.is_const || expected_ptr_type->data.pointer.is_const) && + (!actual_ptr_type->data.pointer.is_volatile || expected_ptr_type->data.pointer.is_volatile) && + actual_ptr_type->data.pointer.bit_offset == expected_ptr_type->data.pointer.bit_offset && + actual_ptr_type->data.pointer.unaligned_bit_count == expected_ptr_type->data.pointer.unaligned_bit_count && + actual_ptr_type->data.pointer.alignment >= expected_ptr_type->data.pointer.alignment) + { + return types_match_const_cast_only(expected_ptr_type->data.pointer.child_type, + actual_ptr_type->data.pointer.child_type); + } } // maybe |