mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 11:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage1: Fix small bug in pointer type analysis

Browse Source 
A flag meant to catch recursively-defined types was never reset, leading
the compiler to generate wrong answers when asked for its
type/alignment.

Closes #6850
This commit is contained in:
LemonBoy 2020-10-28 22:54:10 +01:00 committed by Veikka Tuominen
parent 85dd5746bd
commit b3314a8be6
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/stage1/analyze.cpp
View File

@ -6821,9 +6821,12 @@ static Error resolve_pointer_zero_bits(CodeGen *g, ZigType *ty) {
TypeStructField *field = find_struct_type_field(isf->inferred_struct_type, isf->field_name); TypeStructField *field = find_struct_type_field(isf->inferred_struct_type, isf->field_name);
assert(field != nullptr); assert(field != nullptr);
if (field->is_comptime) { if (field->is_comptime) {
ty->data.pointer.resolve_loop_flag_zero_bits = false;
ty->abi_size = 0; ty->abi_size = 0;
ty->size_in_bits = 0; ty->size_in_bits = 0;
ty->abi_align = 0; ty->abi_align = 0;
return ErrorNone; return ErrorNone;
} }
elem_type = field->type_entry; elem_type = field->type_entry;
@ -6835,6 +6838,8 @@ static Error resolve_pointer_zero_bits(CodeGen *g, ZigType *ty) {
if ((err = type_has_bits2(g, elem_type, &has_bits))) if ((err = type_has_bits2(g, elem_type, &has_bits)))
return err; return err;
ty->data.pointer.resolve_loop_flag_zero_bits = false;
if (has_bits) { if (has_bits) {
ty->abi_size = g->builtin_types.entry_usize->abi_size; ty->abi_size = g->builtin_types.entry_usize->abi_size;
ty->size_in_bits = g->builtin_types.entry_usize->size_in_bits; ty->size_in_bits = g->builtin_types.entry_usize->size_in_bits;

1
test/stage1/behavior.zig
View File

@ -54,6 +54,7 @@ comptime {
_ = @import("behavior/bugs/5474.zig"); _ = @import("behavior/bugs/5474.zig");
_ = @import("behavior/bugs/5487.zig"); _ = @import("behavior/bugs/5487.zig");
_ = @import("behavior/bugs/6781.zig"); _ = @import("behavior/bugs/6781.zig");
_ = @import("behavior/bugs/6850.zig");
_ = @import("behavior/bugs/394.zig"); _ = @import("behavior/bugs/394.zig");
_ = @import("behavior/bugs/421.zig"); _ = @import("behavior/bugs/421.zig");
_ = @import("behavior/bugs/529.zig"); _ = @import("behavior/bugs/529.zig");

12
test/stage1/behavior/bugs/6850.zig Normal file
View File

@ -0,0 +1,12 @@
const std = @import("std");
test "lazy sizeof comparison with zero" {
const Empty = struct {};
const T = *Empty;
std.testing.expect(hasNoBits(T));
}
fn hasNoBits(comptime T: type) bool {
return @sizeOf(T) == 0;
}