authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-07-09 19:50:52-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-07-10 11:10:49-04:00
log3aa48bf859b3eba17c0431c15ae79ab303219eff
tree36c49c7247af655fa2281a848e7aa1ef5d7e01cf
parent9cf42b103601c26294739143f6aeb4b93e1858d8

InternPool: fix race on struct flags

1 files changed, 95 insertions(+), 80 deletions(-)

src/InternPool.zig+95-80
......@@ -2783,20 +2783,22 @@ pub const LoadedStructType = struct {
27832783 }
27842784
27852785 pub fn setInitsWip(s: LoadedStructType, ip: *InternPool) bool {
2786 switch (s.layout) {
2787 .@"packed" => {
2788 const flag = &s.packedFlagsPtr(ip).field_inits_wip;
2789 if (flag.*) return true;
2790 flag.* = true;
2791 return false;
2792 },
2793 .auto, .@"extern" => {
2794 const flag = &s.flagsPtr(ip).field_inits_wip;
2795 if (flag.*) return true;
2796 flag.* = true;
2797 return false;
2798 },
2799 }
2786 return switch (s.layout) {
2787 .@"packed" => @as(Tag.TypeStructPacked.Flags, @bitCast(@atomicRmw(
2788 u32,
2789 @as(*u32, @ptrCast(s.packedFlagsPtr(ip))),
2790 .Or,
2791 @bitCast(Tag.TypeStructPacked.Flags{ .field_inits_wip = true }),
2792 .acq_rel,
2793 ))).field_inits_wip,
2794 .auto, .@"extern" => @as(Tag.TypeStruct.Flags, @bitCast(@atomicRmw(
2795 u32,
2796 @as(*u32, @ptrCast(s.flagsPtr(ip))),
2797 .Or,
2798 @bitCast(Tag.TypeStruct.Flags{ .field_inits_wip = true }),
2799 .acq_rel,
2800 ))).field_inits_wip,
2801 };
28002802 }
28012803
28022804 pub fn clearInitsWip(s: LoadedStructType, ip: *InternPool) void {
......@@ -2962,6 +2964,7 @@ pub const LoadedStructType = struct {
29622964pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
29632965 const unwrapped_index = index.unwrap(ip);
29642966 const extra_list = unwrapped_index.getExtra(ip);
2967 const extra_items = extra_list.view().items(.@"0");
29652968 const item = unwrapped_index.getItem(ip);
29662969 switch (item.tag) {
29672970 .type_struct => {
......@@ -2982,10 +2985,12 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
29822985 .names_map = .none,
29832986 .captures = CaptureValue.Slice.empty,
29842987 };
2985 const extra = extraDataTrail(extra_list, Tag.TypeStruct, item.data);
2986 const fields_len = extra.data.fields_len;
2987 var extra_index = extra.end;
2988 const captures_len = if (extra.data.flags.any_captures) c: {
2988 const decl: DeclIndex = @enumFromInt(extra_items[item.data + std.meta.fieldIndex(Tag.TypeStruct, "decl").?]);
2989 const zir_index: TrackedInst.Index = @enumFromInt(extra_items[item.data + std.meta.fieldIndex(Tag.TypeStruct, "zir_index").?]);
2990 const fields_len = extra_items[item.data + std.meta.fieldIndex(Tag.TypeStruct, "fields_len").?];
2991 const flags: Tag.TypeStruct.Flags = @bitCast(@atomicLoad(u32, &extra_items[item.data + std.meta.fieldIndex(Tag.TypeStruct, "flags").?], .monotonic));
2992 var extra_index = item.data + @as(u32, @typeInfo(Tag.TypeStruct).Struct.fields.len);
2993 const captures_len = if (flags.any_captures) c: {
29892994 const len = extra_list.view().items(.@"0")[extra_index];
29902995 extra_index += 1;
29912996 break :c len;
......@@ -2996,7 +3001,7 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
29963001 .len = captures_len,
29973002 };
29983003 extra_index += captures_len;
2999 if (extra.data.flags.is_reified) {
3004 if (flags.is_reified) {
30003005 extra_index += 2; // PackedU64
30013006 }
30023007 const field_types: Index.Slice = .{
......@@ -3005,7 +3010,7 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
30053010 .len = fields_len,
30063011 };
30073012 extra_index += fields_len;
3008 const names_map: OptionalMapIndex, const names = if (!extra.data.flags.is_tuple) n: {
3013 const names_map: OptionalMapIndex, const names = if (!flags.is_tuple) n: {
30093014 const names_map: OptionalMapIndex = @enumFromInt(extra_list.view().items(.@"0")[extra_index]);
30103015 extra_index += 1;
30113016 const names: NullTerminatedString.Slice = .{
......@@ -3016,7 +3021,7 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
30163021 extra_index += fields_len;
30173022 break :n .{ names_map, names };
30183023 } else .{ .none, NullTerminatedString.Slice.empty };
3019 const inits: Index.Slice = if (extra.data.flags.any_default_inits) i: {
3024 const inits: Index.Slice = if (flags.any_default_inits) i: {
30203025 const inits: Index.Slice = .{
30213026 .tid = unwrapped_index.tid,
30223027 .start = extra_index,
......@@ -3025,12 +3030,12 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
30253030 extra_index += fields_len;
30263031 break :i inits;
30273032 } else Index.Slice.empty;
3028 const namespace: OptionalNamespaceIndex = if (extra.data.flags.has_namespace) n: {
3033 const namespace: OptionalNamespaceIndex = if (flags.has_namespace) n: {
30293034 const n: NamespaceIndex = @enumFromInt(extra_list.view().items(.@"0")[extra_index]);
30303035 extra_index += 1;
30313036 break :n n.toOptional();
30323037 } else .none;
3033 const aligns: Alignment.Slice = if (extra.data.flags.any_aligned_fields) a: {
3038 const aligns: Alignment.Slice = if (flags.any_aligned_fields) a: {
30343039 const a: Alignment.Slice = .{
30353040 .tid = unwrapped_index.tid,
30363041 .start = extra_index,
......@@ -3039,7 +3044,7 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
30393044 extra_index += std.math.divCeil(u32, fields_len, 4) catch unreachable;
30403045 break :a a;
30413046 } else Alignment.Slice.empty;
3042 const comptime_bits: LoadedStructType.ComptimeBits = if (extra.data.flags.any_comptime_fields) c: {
3047 const comptime_bits: LoadedStructType.ComptimeBits = if (flags.any_comptime_fields) c: {
30433048 const len = std.math.divCeil(u32, fields_len, 32) catch unreachable;
30443049 const c: LoadedStructType.ComptimeBits = .{
30453050 .tid = unwrapped_index.tid,
......@@ -3049,7 +3054,7 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
30493054 extra_index += len;
30503055 break :c c;
30513056 } else LoadedStructType.ComptimeBits.empty;
3052 const runtime_order: LoadedStructType.RuntimeOrder.Slice = if (!extra.data.flags.is_extern) ro: {
3057 const runtime_order: LoadedStructType.RuntimeOrder.Slice = if (!flags.is_extern) ro: {
30533058 const ro: LoadedStructType.RuntimeOrder.Slice = .{
30543059 .tid = unwrapped_index.tid,
30553060 .start = extra_index,
......@@ -3070,10 +3075,10 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
30703075 return .{
30713076 .tid = unwrapped_index.tid,
30723077 .extra_index = item.data,
3073 .decl = extra.data.decl.toOptional(),
3078 .decl = decl.toOptional(),
30743079 .namespace = namespace,
3075 .zir_index = extra.data.zir_index.toOptional(),
3076 .layout = if (extra.data.flags.is_extern) .@"extern" else .auto,
3080 .zir_index = zir_index.toOptional(),
3081 .layout = if (flags.is_extern) .@"extern" else .auto,
30773082 .field_names = names,
30783083 .field_types = field_types,
30793084 .field_inits = inits,
......@@ -3086,11 +3091,15 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
30863091 };
30873092 },
30883093 .type_struct_packed, .type_struct_packed_inits => {
3089 const extra = extraDataTrail(extra_list, Tag.TypeStructPacked, item.data);
3094 const decl: DeclIndex = @enumFromInt(extra_items[item.data + std.meta.fieldIndex(Tag.TypeStructPacked, "decl").?]);
3095 const zir_index: TrackedInst.Index = @enumFromInt(extra_items[item.data + std.meta.fieldIndex(Tag.TypeStructPacked, "zir_index").?]);
3096 const fields_len = extra_items[item.data + std.meta.fieldIndex(Tag.TypeStructPacked, "fields_len").?];
3097 const namespace: OptionalNamespaceIndex = @enumFromInt(extra_items[item.data + std.meta.fieldIndex(Tag.TypeStructPacked, "namespace").?]);
3098 const names_map: MapIndex = @enumFromInt(extra_items[item.data + std.meta.fieldIndex(Tag.TypeStructPacked, "names_map").?]);
3099 const flags: Tag.TypeStructPacked.Flags = @bitCast(@atomicLoad(u32, &extra_items[item.data + std.meta.fieldIndex(Tag.TypeStructPacked, "flags").?], .monotonic));
3100 var extra_index = item.data + @as(u32, @typeInfo(Tag.TypeStructPacked).Struct.fields.len);
30903101 const has_inits = item.tag == .type_struct_packed_inits;
3091 const fields_len = extra.data.fields_len;
3092 var extra_index = extra.end;
3093 const captures_len = if (extra.data.flags.any_captures) c: {
3102 const captures_len = if (flags.any_captures) c: {
30943103 const len = extra_list.view().items(.@"0")[extra_index];
30953104 extra_index += 1;
30963105 break :c len;
......@@ -3101,7 +3110,7 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
31013110 .len = captures_len,
31023111 };
31033112 extra_index += captures_len;
3104 if (extra.data.flags.is_reified) {
3113 if (flags.is_reified) {
31053114 extra_index += 2; // PackedU64
31063115 }
31073116 const field_types: Index.Slice = .{
......@@ -3128,9 +3137,9 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
31283137 return .{
31293138 .tid = unwrapped_index.tid,
31303139 .extra_index = item.data,
3131 .decl = extra.data.decl.toOptional(),
3132 .namespace = extra.data.namespace,
3133 .zir_index = extra.data.zir_index.toOptional(),
3140 .decl = decl.toOptional(),
3141 .namespace = namespace,
3142 .zir_index = zir_index.toOptional(),
31343143 .layout = .@"packed",
31353144 .field_names = field_names,
31363145 .field_types = field_types,
......@@ -3139,7 +3148,7 @@ pub fn loadStructType(ip: *const InternPool, index: Index) LoadedStructType {
31393148 .runtime_order = LoadedStructType.RuntimeOrder.Slice.empty,
31403149 .comptime_bits = LoadedStructType.ComptimeBits.empty,
31413150 .offsets = LoadedStructType.Offsets.empty,
3142 .names_map = extra.data.names_map.toOptional(),
3151 .names_map = names_map.toOptional(),
31433152 .captures = captures,
31443153 };
31453154 },
......@@ -4476,11 +4485,11 @@ pub const Tag = enum(u8) {
44764485 flags: Flags,
44774486
44784487 pub const Flags = packed struct(u32) {
4479 any_captures: bool,
4488 any_captures: bool = false,
44804489 /// Dependency loop detection when resolving field inits.
4481 field_inits_wip: bool,
4482 inits_resolved: bool,
4483 is_reified: bool,
4490 field_inits_wip: bool = false,
4491 inits_resolved: bool = false,
4492 is_reified: bool = false,
44844493 _: u28 = 0,
44854494 };
44864495 };
......@@ -4526,36 +4535,36 @@ pub const Tag = enum(u8) {
45264535 size: u32,
45274536
45284537 pub const Flags = packed struct(u32) {
4529 any_captures: bool,
4530 is_extern: bool,
4531 known_non_opv: bool,
4532 requires_comptime: RequiresComptime,
4533 is_tuple: bool,
4534 assumed_runtime_bits: bool,
4535 assumed_pointer_aligned: bool,
4536 has_namespace: bool,
4537 any_comptime_fields: bool,
4538 any_default_inits: bool,
4539 any_aligned_fields: bool,
4538 any_captures: bool = false,
4539 is_extern: bool = false,
4540 known_non_opv: bool = false,
4541 requires_comptime: RequiresComptime = @enumFromInt(0),
4542 is_tuple: bool = false,
4543 assumed_runtime_bits: bool = false,
4544 assumed_pointer_aligned: bool = false,
4545 has_namespace: bool = false,
4546 any_comptime_fields: bool = false,
4547 any_default_inits: bool = false,
4548 any_aligned_fields: bool = false,
45404549 /// `.none` until layout_resolved
4541 alignment: Alignment,
4550 alignment: Alignment = @enumFromInt(0),
45424551 /// Dependency loop detection when resolving struct alignment.
4543 alignment_wip: bool,
4552 alignment_wip: bool = false,
45444553 /// Dependency loop detection when resolving field types.
4545 field_types_wip: bool,
4554 field_types_wip: bool = false,
45464555 /// Dependency loop detection when resolving struct layout.
4547 layout_wip: bool,
4556 layout_wip: bool = false,
45484557 /// Indicates whether `size`, `alignment`, runtime field order, and
45494558 /// field offets are populated.
4550 layout_resolved: bool,
4559 layout_resolved: bool = false,
45514560 /// Dependency loop detection when resolving field inits.
4552 field_inits_wip: bool,
4561 field_inits_wip: bool = false,
45534562 /// Indicates whether `field_inits` has been resolved.
4554 inits_resolved: bool,
4555 // The types and all its fields have had their layout resolved. Even through pointer,
4563 inits_resolved: bool = false,
4564 // The types and all its fields have had their layout resolved. Even through pointer = false,
45564565 // which `layout_resolved` does not ensure.
4557 fully_resolved: bool,
4558 is_reified: bool,
4566 fully_resolved: bool = false,
4567 is_reified: bool = false,
45594568 _: u6 = 0,
45604569 };
45614570 };
......@@ -5400,40 +5409,46 @@ pub fn indexToKey(ip: *const InternPool, index: Index) Key {
54005409 .type_struct => .{ .struct_type = ns: {
54015410 if (data == 0) break :ns .empty_struct;
54025411 const extra_list = unwrapped_index.getExtra(ip);
5403 const extra = extraDataTrail(extra_list, Tag.TypeStruct, data);
5404 if (extra.data.flags.is_reified) {
5405 assert(!extra.data.flags.any_captures);
5412 const extra_items = extra_list.view().items(.@"0");
5413 const zir_index: TrackedInst.Index = @enumFromInt(extra_items[data + std.meta.fieldIndex(Tag.TypeStruct, "zir_index").?]);
5414 const flags: Tag.TypeStruct.Flags = @bitCast(@atomicLoad(u32, &extra_items[data + std.meta.fieldIndex(Tag.TypeStruct, "flags").?], .monotonic));
5415 const end_extra_index = data + @as(u32, @typeInfo(Tag.TypeStruct).Struct.fields.len);
5416 if (flags.is_reified) {
5417 assert(!flags.any_captures);
54065418 break :ns .{ .reified = .{
5407 .zir_index = extra.data.zir_index,
5408 .type_hash = extraData(extra_list, PackedU64, extra.end).get(),
5419 .zir_index = zir_index,
5420 .type_hash = extraData(extra_list, PackedU64, end_extra_index).get(),
54095421 } };
54105422 }
54115423 break :ns .{ .declared = .{
5412 .zir_index = extra.data.zir_index,
5413 .captures = .{ .owned = if (extra.data.flags.any_captures) .{
5424 .zir_index = zir_index,
5425 .captures = .{ .owned = if (flags.any_captures) .{
54145426 .tid = unwrapped_index.tid,
5415 .start = extra.end + 1,
5416 .len = extra_list.view().items(.@"0")[extra.end],
5427 .start = end_extra_index + 1,
5428 .len = extra_list.view().items(.@"0")[end_extra_index],
54175429 } else CaptureValue.Slice.empty },
54185430 } };
54195431 } },
54205432
54215433 .type_struct_packed, .type_struct_packed_inits => .{ .struct_type = ns: {
54225434 const extra_list = unwrapped_index.getExtra(ip);
5423 const extra = extraDataTrail(extra_list, Tag.TypeStructPacked, data);
5424 if (extra.data.flags.is_reified) {
5425 assert(!extra.data.flags.any_captures);
5435 const extra_items = extra_list.view().items(.@"0");
5436 const zir_index: TrackedInst.Index = @enumFromInt(extra_items[item.data + std.meta.fieldIndex(Tag.TypeStructPacked, "zir_index").?]);
5437 const flags: Tag.TypeStructPacked.Flags = @bitCast(@atomicLoad(u32, &extra_items[item.data + std.meta.fieldIndex(Tag.TypeStructPacked, "flags").?], .monotonic));
5438 const end_extra_index = data + @as(u32, @typeInfo(Tag.TypeStructPacked).Struct.fields.len);
5439 if (flags.is_reified) {
5440 assert(!flags.any_captures);
54265441 break :ns .{ .reified = .{
5427 .zir_index = extra.data.zir_index,
5428 .type_hash = extraData(extra_list, PackedU64, extra.end).get(),
5442 .zir_index = zir_index,
5443 .type_hash = extraData(extra_list, PackedU64, end_extra_index).get(),
54295444 } };
54305445 }
54315446 break :ns .{ .declared = .{
5432 .zir_index = extra.data.zir_index,
5433 .captures = .{ .owned = if (extra.data.flags.any_captures) .{
5447 .zir_index = zir_index,
5448 .captures = .{ .owned = if (flags.any_captures) .{
54345449 .tid = unwrapped_index.tid,
5435 .start = extra.end + 1,
5436 .len = extra_list.view().items(.@"0")[extra.end],
5450 .start = end_extra_index + 1,
5451 .len = extra_items[end_extra_index],
54375452 } else CaptureValue.Slice.empty },
54385453 } };
54395454 } },