Skip to content

sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error#17490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kcbanner wants to merge 1 commit into from
Closed

sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error #17490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions src/InternPool.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,7 @@ pub const Key = union(enum) {

/// The returned pointer expires with any addition to the `InternPool`.
/// Asserts the struct is not packed.
pub fn flagsPtr(self: @This(), ip: *InternPool) *Tag.TypeStruct.Flags {
pub fn flagsPtr(self: @This(), ip: *const InternPool) *Tag.TypeStruct.Flags {
assert(self.layout != .Packed);
const flags_field_index = std.meta.fieldIndex(Tag.TypeStruct, "flags").?;
return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
Expand DownExpand Up@@ -688,6 +688,18 @@ pub const Key = union(enum) {
return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
}

/// The returned pointer expires with any addition to the `InternPool`.
pub fn size(self: @This(), ip: *InternPool) *u32 {
const size_field_index = std.meta.fieldIndex(Tag.TypeUnion, "size").?;
return @ptrCast(&ip.extra.items[self.extra_index + size_field_index]);
}

/// The returned pointer expires with any addition to the `InternPool`.
pub fn padding(self: @This(), ip: *InternPool) *u32 {
const padding_field_index = std.meta.fieldIndex(Tag.TypeUnion, "padding").?;
return @ptrCast(&ip.extra.items[self.extra_index + padding_field_index]);
}

pub fn haveFieldTypes(self: @This(), ip: *const InternPool) bool {
return self.flagsPtr(ip).status.haveFieldTypes();
}
Expand DownExpand Up@@ -1737,6 +1749,10 @@ pub const UnionType = struct {
enum_tag_ty: Index,
/// The integer tag type of the enum.
int_tag_ty: Index,
/// ABI size of the union, including padding
size: u64,
/// Trailing padding bytes
padding: u32,
/// List of field names in declaration order.
field_names: NullTerminatedString.Slice,
/// List of field types in declaration order.
Expand DownExpand Up@@ -1823,6 +1839,10 @@ pub const UnionType = struct {
return self.flagsPtr(ip).runtime_tag.hasTag();
}

pub fn haveFieldTypes(self: UnionType, ip: *const InternPool) bool {
return self.flagsPtr(ip).status.haveFieldTypes();
}

pub fn haveLayout(self: UnionType, ip: *const InternPool) bool {
return self.flagsPtr(ip).status.haveLayout();
}
Expand DownExpand Up@@ -1860,6 +1880,8 @@ pub fn loadUnionType(ip: *InternPool, key: Key.UnionType) UnionType {
.namespace = type_union.data.namespace,
.enum_tag_ty = enum_ty,
.int_tag_ty = enum_info.tag_ty,
.size = type_union.data.padding,
.padding = type_union.data.padding,
.field_names = enum_info.names,
.names_map = enum_info.names_map,
.field_types = .{
Expand DownExpand Up@@ -2925,6 +2947,10 @@ pub const Tag = enum(u8) {
/// 1. field align: Alignment for each field; declaration order
pub const TypeUnion = struct {
flags: Flags,
// Only valid after .have_layout
size: u32,
// Only valid after .have_layout
padding: u32,
decl: Module.Decl.Index,
namespace: Module.Namespace.Index,
/// The enum that provides the list of field names and values.
Expand All@@ -2939,7 +2965,9 @@ pub const Tag = enum(u8) {
status: UnionType.Status,
requires_comptime: RequiresComptime,
assumed_runtime_bits: bool,
_: u21 = 0,
field_runtime_bits_wip: bool,
alignment: Alignment,
_: u14 = 0,
};
};

Expand DownExpand Up@@ -2999,11 +3027,12 @@ pub const Tag = enum(u8) {
requires_comptime: RequiresComptime,
is_tuple: bool,
assumed_runtime_bits: bool,
field_runtime_bits_wip: bool,
has_namespace: bool,
any_comptime_fields: bool,
any_default_inits: bool,
any_aligned_fields: bool,
/// `undefined` until the layout_resolved
/// `.none` until layout_resolved
alignment: Alignment,
/// Dependency loop detection when resolving struct alignment.
alignment_wip: bool,
Expand All@@ -3018,7 +3047,7 @@ pub const Tag = enum(u8) {
// which `layout_resolved` does not ensure.
fully_resolved: bool,

_: u11 = 0,
_: u10 = 0,
};
};
};
Expand DownExpand Up@@ -5213,6 +5242,8 @@ pub fn getUnionType(ip: *InternPool, gpa: Allocator, ini: UnionTypeInit) Allocat

const union_type_extra_index = ip.addExtraAssumeCapacity(Tag.TypeUnion{
.flags = ini.flags,
.size = std.math.maxInt(u32),
.padding = std.math.maxInt(u32),
.decl = ini.decl,
.namespace = ini.namespace,
.tag_ty = ini.enum_tag_ty,
Expand DownExpand Up@@ -5352,6 +5383,7 @@ pub fn getStructType(
.requires_comptime = ini.requires_comptime,
.is_tuple = ini.is_tuple,
.assumed_runtime_bits = false,
.field_runtime_bits_wip = false,
.has_namespace = ini.namespace != .none,
.any_comptime_fields = ini.any_comptime_fields,
.any_default_inits = ini.any_default_inits,
Expand Down
50 changes: 18 additions & 32 deletions src/Module.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2504,6 +2504,8 @@ pub const CompileError = error{
/// In a comptime scope, a break instruction was encountered. This error is only seen when
/// evaluating a comptime block.
ComptimeBreak,
/// A dependency loop was detected when resolving if a field type has runtime bits
CircularComptimeRequirementCheck,
};

pub fn init(mod: *Module) !void {
Expand DownExpand Up@@ -4791,6 +4793,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
error.GenericPoison => unreachable,
error.ComptimeReturn => unreachable,
error.ComptimeBreak => unreachable,
error.CircularComptimeRequirementCheck => unreachable,
else => |e| return e,
};
if (opt_opv) |opv| {
Expand DownExpand Up@@ -4820,10 +4823,10 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
inner_block.error_return_trace_index = error_return_trace_index;

sema.analyzeBody(&inner_block, fn_info.body) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
error.NeededSourceLocation => unreachable,
error.GenericPoison => unreachable,
error.ComptimeReturn => unreachable,
error.CircularComptimeRequirementCheck => unreachable,
else => |e| return e,
};

Expand All@@ -4845,11 +4848,11 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
!sema.fn_ret_ty.isError(mod))
{
sema.setupErrorReturnTrace(&inner_block, last_arg_index) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
error.ComptimeBreak => @panic("zig compiler bug: ComptimeBreak"),
error.NeededSourceLocation => unreachable,
error.GenericPoison => unreachable,
error.ComptimeReturn => unreachable,
error.ComptimeBreak => unreachable,
error.CircularComptimeRequirementCheck => unreachable,
else => |e| return e,
};
}
Expand DownExpand Up@@ -4877,6 +4880,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
error.GenericPoison => unreachable,
error.ComptimeReturn => unreachable,
error.ComptimeBreak => unreachable,
error.CircularComptimeRequirementCheck => unreachable,
error.AnalysisFail => {
// In this case our function depends on a type that had a compile error.
// We should not try to lower this function.
Expand All@@ -4901,6 +4905,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
error.GenericPoison => unreachable,
error.ComptimeReturn => unreachable,
error.ComptimeBreak => unreachable,
error.CircularComptimeRequirementCheck => unreachable,
error.AnalysisFail => {
// In this case our function depends on a type that had a compile error.
// We should not try to lower this function.
Expand All@@ -4918,6 +4923,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
error.GenericPoison => unreachable,
error.ComptimeReturn => unreachable,
error.ComptimeBreak => unreachable,
error.CircularComptimeRequirementCheck => unreachable,
error.AnalysisFail => {
// In this case our function depends on a type that had a compile error.
// We should not try to lower this function.
Expand DownExpand Up@@ -6516,31 +6522,11 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
.padding = 0,
};
}
// Put the tag before or after the payload depending on which one's
// alignment is greater.

const tag_size = u.enum_tag_ty.toType().abiSize(mod);
const tag_align = u.enum_tag_ty.toType().abiAlignment(mod).max(.@"1");
var size: u64 = 0;
var padding: u32 = undefined;
if (tag_align.compare(.gte, payload_align)) {
// {Tag, Payload}
size += tag_size;
size = payload_align.forward(size);
size += payload_size;
const prev_size = size;
size = tag_align.forward(size);
padding = @intCast(size - prev_size);
} else {
// {Payload, Tag}
size += payload_size;
size = tag_align.forward(size);
size += tag_size;
const prev_size = size;
size = payload_align.forward(size);
padding = @intCast(size - prev_size);
}
return .{
.abi_size = size,
.abi_size = u.size,
.abi_align = tag_align.max(payload_align),
.most_aligned_field = most_aligned_field,
.most_aligned_field_size = most_aligned_field_size,
Expand All@@ -6549,7 +6535,7 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
.payload_align = payload_align,
.tag_align = tag_align,
.tag_size = tag_size,
.padding = padding,
.padding = u.padding,
};
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error by kcbanner · Pull Request #17490 · ziglang/zig · GitHub
Skip to content
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error#17490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kcbanner
wants to merge
1
commit into

from

 Closed


sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error
#17490
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


40 changes: 36 additions & 4 deletions
src/InternPool.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,7 @@ pub const Key = union(enum) {

 /// The returned pointer expires with any addition to the `InternPool`.
 /// Asserts the struct is not packed.
 pub fn flagsPtr(self: @This(), ip: *InternPool) *Tag.TypeStruct.Flags {
 pub fn flagsPtr(self: @This(), ip: *const InternPool) *Tag.TypeStruct.Flags {
 assert(self.layout != .Packed);
 const flags_field_index = std.meta.fieldIndex(Tag.TypeStruct, "flags").?;
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
Expand DownExpand Up@@ -688,6 +688,18 @@ pub const Key = union(enum) {
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn size(self: @This(), ip: *InternPool) *u32 {
 const size_field_index = std.meta.fieldIndex(Tag.TypeUnion, "size").?;
 return @ptrCast(&ip.extra.items[self.extra_index + size_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn padding(self: @This(), ip: *InternPool) *u32 {
 const padding_field_index = std.meta.fieldIndex(Tag.TypeUnion, "padding").?;
 return @ptrCast(&ip.extra.items[self.extra_index + padding_field_index]);
 }

 pub fn haveFieldTypes(self: @This(), ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }
Expand DownExpand Up@@ -1737,6 +1749,10 @@ pub const UnionType = struct {
 enum_tag_ty: Index,
 /// The integer tag type of the enum.
 int_tag_ty: Index,
 /// ABI size of the union, including padding
 size: u64,
 /// Trailing padding bytes
 padding: u32,
 /// List of field names in declaration order.
 field_names: NullTerminatedString.Slice,
 /// List of field types in declaration order.
Expand DownExpand Up@@ -1823,6 +1839,10 @@ pub const UnionType = struct {
 return self.flagsPtr(ip).runtime_tag.hasTag();
 }

 pub fn haveFieldTypes(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }

 pub fn haveLayout(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveLayout();
 }
Expand DownExpand Up@@ -1860,6 +1880,8 @@ pub fn loadUnionType(ip: *InternPool, key: Key.UnionType) UnionType {
 .namespace = type_union.data.namespace,
 .enum_tag_ty = enum_ty,
 .int_tag_ty = enum_info.tag_ty,
 .size = type_union.data.padding,
 .padding = type_union.data.padding,
 .field_names = enum_info.names,
 .names_map = enum_info.names_map,
 .field_types = .{
Expand DownExpand Up@@ -2925,6 +2947,10 @@ pub const Tag = enum(u8) {
 /// 1. field align: Alignment for each field; declaration order
 pub const TypeUnion = struct {
 flags: Flags,
 // Only valid after .have_layout
 size: u32,
 // Only valid after .have_layout
 padding: u32,
 decl: Module.Decl.Index,
 namespace: Module.Namespace.Index,
 /// The enum that provides the list of field names and values.
Expand All@@ -2939,7 +2965,9 @@ pub const Tag = enum(u8) {
 status: UnionType.Status,
 requires_comptime: RequiresComptime,
 assumed_runtime_bits: bool,
 _: u21 = 0,
 field_runtime_bits_wip: bool,
 alignment: Alignment,
 _: u14 = 0,
 };
 };

Expand DownExpand Up@@ -2999,11 +3027,12 @@ pub const Tag = enum(u8) {
 requires_comptime: RequiresComptime,
 is_tuple: bool,
 assumed_runtime_bits: bool,
 field_runtime_bits_wip: bool,
 has_namespace: bool,
 any_comptime_fields: bool,
 any_default_inits: bool,
 any_aligned_fields: bool,
 /// `undefined` until the layout_resolved
 /// `.none` until layout_resolved
 alignment: Alignment,
 /// Dependency loop detection when resolving struct alignment.
 alignment_wip: bool,
Expand All@@ -3018,7 +3047,7 @@ pub const Tag = enum(u8) {
 // which `layout_resolved` does not ensure.
 fully_resolved: bool,

 _: u11 = 0,
 _: u10 = 0,
 };
 };
};
Expand DownExpand Up@@ -5213,6 +5242,8 @@ pub fn getUnionType(ip: *InternPool, gpa: Allocator, ini: UnionTypeInit) Allocat

 const union_type_extra_index = ip.addExtraAssumeCapacity(Tag.TypeUnion{
 .flags = ini.flags,
 .size = std.math.maxInt(u32),
 .padding = std.math.maxInt(u32),
 .decl = ini.decl,
 .namespace = ini.namespace,
 .tag_ty = ini.enum_tag_ty,
Expand DownExpand Up@@ -5352,6 +5383,7 @@ pub fn getStructType(
 .requires_comptime = ini.requires_comptime,
 .is_tuple = ini.is_tuple,
 .assumed_runtime_bits = false,
 .field_runtime_bits_wip = false,
 .has_namespace = ini.namespace != .none,
 .any_comptime_fields = ini.any_comptime_fields,
 .any_default_inits = ini.any_default_inits,
Expand Down

50 changes: 18 additions & 32 deletions
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2504,6 +2504,8 @@ pub const CompileError = error{
 /// In a comptime scope, a break instruction was encountered. This error is only seen when
 /// evaluating a comptime block.
 ComptimeBreak,
 /// A dependency loop was detected when resolving if a field type has runtime bits
 CircularComptimeRequirementCheck,
};

pub fn init(mod: *Module) !void {
Expand DownExpand Up@@ -4791,6 +4793,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 if (opt_opv) |opv| {
Expand DownExpand Up@@ -4820,10 +4823,10 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 inner_block.error_return_trace_index = error_return_trace_index;

 sema.analyzeBody(&inner_block, fn_info.body) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };

Expand All@@ -4845,11 +4848,11 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 !sema.fn_ret_ty.isError(mod))
 {
 sema.setupErrorReturnTrace(&inner_block, last_arg_index) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
 error.ComptimeBreak => @panic("zig compiler bug: ComptimeBreak"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 }
Expand DownExpand Up@@ -4877,6 +4880,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4901,6 +4905,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4918,6 +4923,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand DownExpand Up@@ -6516,31 +6522,11 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .padding = 0,
 };
 }
 // Put the tag before or after the payload depending on which one's
 // alignment is greater.

 const tag_size = u.enum_tag_ty.toType().abiSize(mod);
 const tag_align = u.enum_tag_ty.toType().abiAlignment(mod).max(.@"1");
 var size: u64 = 0;
 var padding: u32 = undefined;
 if (tag_align.compare(.gte, payload_align)) {
 // {Tag, Payload}
 size += tag_size;
 size = payload_align.forward(size);
 size += payload_size;
 const prev_size = size;
 size = tag_align.forward(size);
 padding = @intCast(size - prev_size);
 } else {
 // {Payload, Tag}
 size += payload_size;
 size = tag_align.forward(size);
 size += tag_size;
 const prev_size = size;
 size = payload_align.forward(size);
 padding = @intCast(size - prev_size);
 }
 return .{
 .abi_size = size,
 .abi_size = u.size,
 .abi_align = tag_align.max(payload_align),
 .most_aligned_field = most_aligned_field,
 .most_aligned_field_size = most_aligned_field_size,
Expand All@@ -6549,7 +6535,7 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .payload_align = payload_align,
 .tag_align = tag_align,
 .tag_size = tag_size,
 .padding = padding,
 .padding = u.padding,
 };
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error by kcbanner · Pull Request #17490 · ziglang/zig · GitHub
Skip to content
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error#17490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kcbanner
wants to merge
1
commit into

from

 Closed


sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error
#17490
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


40 changes: 36 additions & 4 deletions
src/InternPool.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,7 @@ pub const Key = union(enum) {

 /// The returned pointer expires with any addition to the `InternPool`.
 /// Asserts the struct is not packed.
 pub fn flagsPtr(self: @This(), ip: *InternPool) *Tag.TypeStruct.Flags {
 pub fn flagsPtr(self: @This(), ip: *const InternPool) *Tag.TypeStruct.Flags {
 assert(self.layout != .Packed);
 const flags_field_index = std.meta.fieldIndex(Tag.TypeStruct, "flags").?;
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
Expand DownExpand Up@@ -688,6 +688,18 @@ pub const Key = union(enum) {
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn size(self: @This(), ip: *InternPool) *u32 {
 const size_field_index = std.meta.fieldIndex(Tag.TypeUnion, "size").?;
 return @ptrCast(&ip.extra.items[self.extra_index + size_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn padding(self: @This(), ip: *InternPool) *u32 {
 const padding_field_index = std.meta.fieldIndex(Tag.TypeUnion, "padding").?;
 return @ptrCast(&ip.extra.items[self.extra_index + padding_field_index]);
 }

 pub fn haveFieldTypes(self: @This(), ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }
Expand DownExpand Up@@ -1737,6 +1749,10 @@ pub const UnionType = struct {
 enum_tag_ty: Index,
 /// The integer tag type of the enum.
 int_tag_ty: Index,
 /// ABI size of the union, including padding
 size: u64,
 /// Trailing padding bytes
 padding: u32,
 /// List of field names in declaration order.
 field_names: NullTerminatedString.Slice,
 /// List of field types in declaration order.
Expand DownExpand Up@@ -1823,6 +1839,10 @@ pub const UnionType = struct {
 return self.flagsPtr(ip).runtime_tag.hasTag();
 }

 pub fn haveFieldTypes(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }

 pub fn haveLayout(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveLayout();
 }
Expand DownExpand Up@@ -1860,6 +1880,8 @@ pub fn loadUnionType(ip: *InternPool, key: Key.UnionType) UnionType {
 .namespace = type_union.data.namespace,
 .enum_tag_ty = enum_ty,
 .int_tag_ty = enum_info.tag_ty,
 .size = type_union.data.padding,
 .padding = type_union.data.padding,
 .field_names = enum_info.names,
 .names_map = enum_info.names_map,
 .field_types = .{
Expand DownExpand Up@@ -2925,6 +2947,10 @@ pub const Tag = enum(u8) {
 /// 1. field align: Alignment for each field; declaration order
 pub const TypeUnion = struct {
 flags: Flags,
 // Only valid after .have_layout
 size: u32,
 // Only valid after .have_layout
 padding: u32,
 decl: Module.Decl.Index,
 namespace: Module.Namespace.Index,
 /// The enum that provides the list of field names and values.
Expand All@@ -2939,7 +2965,9 @@ pub const Tag = enum(u8) {
 status: UnionType.Status,
 requires_comptime: RequiresComptime,
 assumed_runtime_bits: bool,
 _: u21 = 0,
 field_runtime_bits_wip: bool,
 alignment: Alignment,
 _: u14 = 0,
 };
 };

Expand DownExpand Up@@ -2999,11 +3027,12 @@ pub const Tag = enum(u8) {
 requires_comptime: RequiresComptime,
 is_tuple: bool,
 assumed_runtime_bits: bool,
 field_runtime_bits_wip: bool,
 has_namespace: bool,
 any_comptime_fields: bool,
 any_default_inits: bool,
 any_aligned_fields: bool,
 /// `undefined` until the layout_resolved
 /// `.none` until layout_resolved
 alignment: Alignment,
 /// Dependency loop detection when resolving struct alignment.
 alignment_wip: bool,
Expand All@@ -3018,7 +3047,7 @@ pub const Tag = enum(u8) {
 // which `layout_resolved` does not ensure.
 fully_resolved: bool,

 _: u11 = 0,
 _: u10 = 0,
 };
 };
};
Expand DownExpand Up@@ -5213,6 +5242,8 @@ pub fn getUnionType(ip: *InternPool, gpa: Allocator, ini: UnionTypeInit) Allocat

 const union_type_extra_index = ip.addExtraAssumeCapacity(Tag.TypeUnion{
 .flags = ini.flags,
 .size = std.math.maxInt(u32),
 .padding = std.math.maxInt(u32),
 .decl = ini.decl,
 .namespace = ini.namespace,
 .tag_ty = ini.enum_tag_ty,
Expand DownExpand Up@@ -5352,6 +5383,7 @@ pub fn getStructType(
 .requires_comptime = ini.requires_comptime,
 .is_tuple = ini.is_tuple,
 .assumed_runtime_bits = false,
 .field_runtime_bits_wip = false,
 .has_namespace = ini.namespace != .none,
 .any_comptime_fields = ini.any_comptime_fields,
 .any_default_inits = ini.any_default_inits,
Expand Down

50 changes: 18 additions & 32 deletions
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2504,6 +2504,8 @@ pub const CompileError = error{
 /// In a comptime scope, a break instruction was encountered. This error is only seen when
 /// evaluating a comptime block.
 ComptimeBreak,
 /// A dependency loop was detected when resolving if a field type has runtime bits
 CircularComptimeRequirementCheck,
};

pub fn init(mod: *Module) !void {
Expand DownExpand Up@@ -4791,6 +4793,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 if (opt_opv) |opv| {
Expand DownExpand Up@@ -4820,10 +4823,10 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 inner_block.error_return_trace_index = error_return_trace_index;

 sema.analyzeBody(&inner_block, fn_info.body) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };

Expand All@@ -4845,11 +4848,11 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 !sema.fn_ret_ty.isError(mod))
 {
 sema.setupErrorReturnTrace(&inner_block, last_arg_index) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
 error.ComptimeBreak => @panic("zig compiler bug: ComptimeBreak"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 }
Expand DownExpand Up@@ -4877,6 +4880,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4901,6 +4905,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4918,6 +4923,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand DownExpand Up@@ -6516,31 +6522,11 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .padding = 0,
 };
 }
 // Put the tag before or after the payload depending on which one's
 // alignment is greater.

 const tag_size = u.enum_tag_ty.toType().abiSize(mod);
 const tag_align = u.enum_tag_ty.toType().abiAlignment(mod).max(.@"1");
 var size: u64 = 0;
 var padding: u32 = undefined;
 if (tag_align.compare(.gte, payload_align)) {
 // {Tag, Payload}
 size += tag_size;
 size = payload_align.forward(size);
 size += payload_size;
 const prev_size = size;
 size = tag_align.forward(size);
 padding = @intCast(size - prev_size);
 } else {
 // {Payload, Tag}
 size += payload_size;
 size = tag_align.forward(size);
 size += tag_size;
 const prev_size = size;
 size = payload_align.forward(size);
 padding = @intCast(size - prev_size);
 }
 return .{
 .abi_size = size,
 .abi_size = u.size,
 .abi_align = tag_align.max(payload_align),
 .most_aligned_field = most_aligned_field,
 .most_aligned_field_size = most_aligned_field_size,
Expand All@@ -6549,7 +6535,7 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .payload_align = payload_align,
 .tag_align = tag_align,
 .tag_size = tag_size,
 .padding = padding,
 .padding = u.padding,
 };
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error by kcbanner · Pull Request #17490 · ziglang/zig · GitHub
Skip to content
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error#17490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kcbanner
wants to merge
1
commit into

from

 Closed


sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error
#17490
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


40 changes: 36 additions & 4 deletions
src/InternPool.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,7 @@ pub const Key = union(enum) {

 /// The returned pointer expires with any addition to the `InternPool`.
 /// Asserts the struct is not packed.
 pub fn flagsPtr(self: @This(), ip: *InternPool) *Tag.TypeStruct.Flags {
 pub fn flagsPtr(self: @This(), ip: *const InternPool) *Tag.TypeStruct.Flags {
 assert(self.layout != .Packed);
 const flags_field_index = std.meta.fieldIndex(Tag.TypeStruct, "flags").?;
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
Expand DownExpand Up@@ -688,6 +688,18 @@ pub const Key = union(enum) {
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn size(self: @This(), ip: *InternPool) *u32 {
 const size_field_index = std.meta.fieldIndex(Tag.TypeUnion, "size").?;
 return @ptrCast(&ip.extra.items[self.extra_index + size_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn padding(self: @This(), ip: *InternPool) *u32 {
 const padding_field_index = std.meta.fieldIndex(Tag.TypeUnion, "padding").?;
 return @ptrCast(&ip.extra.items[self.extra_index + padding_field_index]);
 }

 pub fn haveFieldTypes(self: @This(), ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }
Expand DownExpand Up@@ -1737,6 +1749,10 @@ pub const UnionType = struct {
 enum_tag_ty: Index,
 /// The integer tag type of the enum.
 int_tag_ty: Index,
 /// ABI size of the union, including padding
 size: u64,
 /// Trailing padding bytes
 padding: u32,
 /// List of field names in declaration order.
 field_names: NullTerminatedString.Slice,
 /// List of field types in declaration order.
Expand DownExpand Up@@ -1823,6 +1839,10 @@ pub const UnionType = struct {
 return self.flagsPtr(ip).runtime_tag.hasTag();
 }

 pub fn haveFieldTypes(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }

 pub fn haveLayout(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveLayout();
 }
Expand DownExpand Up@@ -1860,6 +1880,8 @@ pub fn loadUnionType(ip: *InternPool, key: Key.UnionType) UnionType {
 .namespace = type_union.data.namespace,
 .enum_tag_ty = enum_ty,
 .int_tag_ty = enum_info.tag_ty,
 .size = type_union.data.padding,
 .padding = type_union.data.padding,
 .field_names = enum_info.names,
 .names_map = enum_info.names_map,
 .field_types = .{
Expand DownExpand Up@@ -2925,6 +2947,10 @@ pub const Tag = enum(u8) {
 /// 1. field align: Alignment for each field; declaration order
 pub const TypeUnion = struct {
 flags: Flags,
 // Only valid after .have_layout
 size: u32,
 // Only valid after .have_layout
 padding: u32,
 decl: Module.Decl.Index,
 namespace: Module.Namespace.Index,
 /// The enum that provides the list of field names and values.
Expand All@@ -2939,7 +2965,9 @@ pub const Tag = enum(u8) {
 status: UnionType.Status,
 requires_comptime: RequiresComptime,
 assumed_runtime_bits: bool,
 _: u21 = 0,
 field_runtime_bits_wip: bool,
 alignment: Alignment,
 _: u14 = 0,
 };
 };

Expand DownExpand Up@@ -2999,11 +3027,12 @@ pub const Tag = enum(u8) {
 requires_comptime: RequiresComptime,
 is_tuple: bool,
 assumed_runtime_bits: bool,
 field_runtime_bits_wip: bool,
 has_namespace: bool,
 any_comptime_fields: bool,
 any_default_inits: bool,
 any_aligned_fields: bool,
 /// `undefined` until the layout_resolved
 /// `.none` until layout_resolved
 alignment: Alignment,
 /// Dependency loop detection when resolving struct alignment.
 alignment_wip: bool,
Expand All@@ -3018,7 +3047,7 @@ pub const Tag = enum(u8) {
 // which `layout_resolved` does not ensure.
 fully_resolved: bool,

 _: u11 = 0,
 _: u10 = 0,
 };
 };
};
Expand DownExpand Up@@ -5213,6 +5242,8 @@ pub fn getUnionType(ip: *InternPool, gpa: Allocator, ini: UnionTypeInit) Allocat

 const union_type_extra_index = ip.addExtraAssumeCapacity(Tag.TypeUnion{
 .flags = ini.flags,
 .size = std.math.maxInt(u32),
 .padding = std.math.maxInt(u32),
 .decl = ini.decl,
 .namespace = ini.namespace,
 .tag_ty = ini.enum_tag_ty,
Expand DownExpand Up@@ -5352,6 +5383,7 @@ pub fn getStructType(
 .requires_comptime = ini.requires_comptime,
 .is_tuple = ini.is_tuple,
 .assumed_runtime_bits = false,
 .field_runtime_bits_wip = false,
 .has_namespace = ini.namespace != .none,
 .any_comptime_fields = ini.any_comptime_fields,
 .any_default_inits = ini.any_default_inits,
Expand Down

50 changes: 18 additions & 32 deletions
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2504,6 +2504,8 @@ pub const CompileError = error{
 /// In a comptime scope, a break instruction was encountered. This error is only seen when
 /// evaluating a comptime block.
 ComptimeBreak,
 /// A dependency loop was detected when resolving if a field type has runtime bits
 CircularComptimeRequirementCheck,
};

pub fn init(mod: *Module) !void {
Expand DownExpand Up@@ -4791,6 +4793,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 if (opt_opv) |opv| {
Expand DownExpand Up@@ -4820,10 +4823,10 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 inner_block.error_return_trace_index = error_return_trace_index;

 sema.analyzeBody(&inner_block, fn_info.body) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };

Expand All@@ -4845,11 +4848,11 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 !sema.fn_ret_ty.isError(mod))
 {
 sema.setupErrorReturnTrace(&inner_block, last_arg_index) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
 error.ComptimeBreak => @panic("zig compiler bug: ComptimeBreak"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 }
Expand DownExpand Up@@ -4877,6 +4880,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4901,6 +4905,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4918,6 +4923,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand DownExpand Up@@ -6516,31 +6522,11 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .padding = 0,
 };
 }
 // Put the tag before or after the payload depending on which one's
 // alignment is greater.

 const tag_size = u.enum_tag_ty.toType().abiSize(mod);
 const tag_align = u.enum_tag_ty.toType().abiAlignment(mod).max(.@"1");
 var size: u64 = 0;
 var padding: u32 = undefined;
 if (tag_align.compare(.gte, payload_align)) {
 // {Tag, Payload}
 size += tag_size;
 size = payload_align.forward(size);
 size += payload_size;
 const prev_size = size;
 size = tag_align.forward(size);
 padding = @intCast(size - prev_size);
 } else {
 // {Payload, Tag}
 size += payload_size;
 size = tag_align.forward(size);
 size += tag_size;
 const prev_size = size;
 size = payload_align.forward(size);
 padding = @intCast(size - prev_size);
 }
 return .{
 .abi_size = size,
 .abi_size = u.size,
 .abi_align = tag_align.max(payload_align),
 .most_aligned_field = most_aligned_field,
 .most_aligned_field_size = most_aligned_field_size,
Expand All@@ -6549,7 +6535,7 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .payload_align = payload_align,
 .tag_align = tag_align,
 .tag_size = tag_size,
 .padding = padding,
 .padding = u.padding,
 };
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error by kcbanner · Pull Request #17490 · ziglang/zig · GitHub
Skip to content
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error#17490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kcbanner
wants to merge
1
commit into

from

 Closed


sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error
#17490
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


40 changes: 36 additions & 4 deletions
src/InternPool.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,7 @@ pub const Key = union(enum) {

 /// The returned pointer expires with any addition to the `InternPool`.
 /// Asserts the struct is not packed.
 pub fn flagsPtr(self: @This(), ip: *InternPool) *Tag.TypeStruct.Flags {
 pub fn flagsPtr(self: @This(), ip: *const InternPool) *Tag.TypeStruct.Flags {
 assert(self.layout != .Packed);
 const flags_field_index = std.meta.fieldIndex(Tag.TypeStruct, "flags").?;
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
Expand DownExpand Up@@ -688,6 +688,18 @@ pub const Key = union(enum) {
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn size(self: @This(), ip: *InternPool) *u32 {
 const size_field_index = std.meta.fieldIndex(Tag.TypeUnion, "size").?;
 return @ptrCast(&ip.extra.items[self.extra_index + size_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn padding(self: @This(), ip: *InternPool) *u32 {
 const padding_field_index = std.meta.fieldIndex(Tag.TypeUnion, "padding").?;
 return @ptrCast(&ip.extra.items[self.extra_index + padding_field_index]);
 }

 pub fn haveFieldTypes(self: @This(), ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }
Expand DownExpand Up@@ -1737,6 +1749,10 @@ pub const UnionType = struct {
 enum_tag_ty: Index,
 /// The integer tag type of the enum.
 int_tag_ty: Index,
 /// ABI size of the union, including padding
 size: u64,
 /// Trailing padding bytes
 padding: u32,
 /// List of field names in declaration order.
 field_names: NullTerminatedString.Slice,
 /// List of field types in declaration order.
Expand DownExpand Up@@ -1823,6 +1839,10 @@ pub const UnionType = struct {
 return self.flagsPtr(ip).runtime_tag.hasTag();
 }

 pub fn haveFieldTypes(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }

 pub fn haveLayout(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveLayout();
 }
Expand DownExpand Up@@ -1860,6 +1880,8 @@ pub fn loadUnionType(ip: *InternPool, key: Key.UnionType) UnionType {
 .namespace = type_union.data.namespace,
 .enum_tag_ty = enum_ty,
 .int_tag_ty = enum_info.tag_ty,
 .size = type_union.data.padding,
 .padding = type_union.data.padding,
 .field_names = enum_info.names,
 .names_map = enum_info.names_map,
 .field_types = .{
Expand DownExpand Up@@ -2925,6 +2947,10 @@ pub const Tag = enum(u8) {
 /// 1. field align: Alignment for each field; declaration order
 pub const TypeUnion = struct {
 flags: Flags,
 // Only valid after .have_layout
 size: u32,
 // Only valid after .have_layout
 padding: u32,
 decl: Module.Decl.Index,
 namespace: Module.Namespace.Index,
 /// The enum that provides the list of field names and values.
Expand All@@ -2939,7 +2965,9 @@ pub const Tag = enum(u8) {
 status: UnionType.Status,
 requires_comptime: RequiresComptime,
 assumed_runtime_bits: bool,
 _: u21 = 0,
 field_runtime_bits_wip: bool,
 alignment: Alignment,
 _: u14 = 0,
 };
 };

Expand DownExpand Up@@ -2999,11 +3027,12 @@ pub const Tag = enum(u8) {
 requires_comptime: RequiresComptime,
 is_tuple: bool,
 assumed_runtime_bits: bool,
 field_runtime_bits_wip: bool,
 has_namespace: bool,
 any_comptime_fields: bool,
 any_default_inits: bool,
 any_aligned_fields: bool,
 /// `undefined` until the layout_resolved
 /// `.none` until layout_resolved
 alignment: Alignment,
 /// Dependency loop detection when resolving struct alignment.
 alignment_wip: bool,
Expand All@@ -3018,7 +3047,7 @@ pub const Tag = enum(u8) {
 // which `layout_resolved` does not ensure.
 fully_resolved: bool,

 _: u11 = 0,
 _: u10 = 0,
 };
 };
};
Expand DownExpand Up@@ -5213,6 +5242,8 @@ pub fn getUnionType(ip: *InternPool, gpa: Allocator, ini: UnionTypeInit) Allocat

 const union_type_extra_index = ip.addExtraAssumeCapacity(Tag.TypeUnion{
 .flags = ini.flags,
 .size = std.math.maxInt(u32),
 .padding = std.math.maxInt(u32),
 .decl = ini.decl,
 .namespace = ini.namespace,
 .tag_ty = ini.enum_tag_ty,
Expand DownExpand Up@@ -5352,6 +5383,7 @@ pub fn getStructType(
 .requires_comptime = ini.requires_comptime,
 .is_tuple = ini.is_tuple,
 .assumed_runtime_bits = false,
 .field_runtime_bits_wip = false,
 .has_namespace = ini.namespace != .none,
 .any_comptime_fields = ini.any_comptime_fields,
 .any_default_inits = ini.any_default_inits,
Expand Down

50 changes: 18 additions & 32 deletions
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2504,6 +2504,8 @@ pub const CompileError = error{
 /// In a comptime scope, a break instruction was encountered. This error is only seen when
 /// evaluating a comptime block.
 ComptimeBreak,
 /// A dependency loop was detected when resolving if a field type has runtime bits
 CircularComptimeRequirementCheck,
};

pub fn init(mod: *Module) !void {
Expand DownExpand Up@@ -4791,6 +4793,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 if (opt_opv) |opv| {
Expand DownExpand Up@@ -4820,10 +4823,10 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 inner_block.error_return_trace_index = error_return_trace_index;

 sema.analyzeBody(&inner_block, fn_info.body) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };

Expand All@@ -4845,11 +4848,11 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 !sema.fn_ret_ty.isError(mod))
 {
 sema.setupErrorReturnTrace(&inner_block, last_arg_index) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
 error.ComptimeBreak => @panic("zig compiler bug: ComptimeBreak"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 }
Expand DownExpand Up@@ -4877,6 +4880,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4901,6 +4905,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4918,6 +4923,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand DownExpand Up@@ -6516,31 +6522,11 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .padding = 0,
 };
 }
 // Put the tag before or after the payload depending on which one's
 // alignment is greater.

 const tag_size = u.enum_tag_ty.toType().abiSize(mod);
 const tag_align = u.enum_tag_ty.toType().abiAlignment(mod).max(.@"1");
 var size: u64 = 0;
 var padding: u32 = undefined;
 if (tag_align.compare(.gte, payload_align)) {
 // {Tag, Payload}
 size += tag_size;
 size = payload_align.forward(size);
 size += payload_size;
 const prev_size = size;
 size = tag_align.forward(size);
 padding = @intCast(size - prev_size);
 } else {
 // {Payload, Tag}
 size += payload_size;
 size = tag_align.forward(size);
 size += tag_size;
 const prev_size = size;
 size = payload_align.forward(size);
 padding = @intCast(size - prev_size);
 }
 return .{
 .abi_size = size,
 .abi_size = u.size,
 .abi_align = tag_align.max(payload_align),
 .most_aligned_field = most_aligned_field,
 .most_aligned_field_size = most_aligned_field_size,
Expand All@@ -6549,7 +6535,7 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .payload_align = payload_align,
 .tag_align = tag_align,
 .tag_size = tag_size,
 .padding = padding,
 .padding = u.padding,
 };
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error by kcbanner · Pull Request #17490 · ziglang/zig · GitHub
Skip to content
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error#17490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kcbanner
wants to merge
1
commit into

from

 Closed


sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error
#17490
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


40 changes: 36 additions & 4 deletions
src/InternPool.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,7 @@ pub const Key = union(enum) {

 /// The returned pointer expires with any addition to the `InternPool`.
 /// Asserts the struct is not packed.
 pub fn flagsPtr(self: @This(), ip: *InternPool) *Tag.TypeStruct.Flags {
 pub fn flagsPtr(self: @This(), ip: *const InternPool) *Tag.TypeStruct.Flags {
 assert(self.layout != .Packed);
 const flags_field_index = std.meta.fieldIndex(Tag.TypeStruct, "flags").?;
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
Expand DownExpand Up@@ -688,6 +688,18 @@ pub const Key = union(enum) {
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn size(self: @This(), ip: *InternPool) *u32 {
 const size_field_index = std.meta.fieldIndex(Tag.TypeUnion, "size").?;
 return @ptrCast(&ip.extra.items[self.extra_index + size_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn padding(self: @This(), ip: *InternPool) *u32 {
 const padding_field_index = std.meta.fieldIndex(Tag.TypeUnion, "padding").?;
 return @ptrCast(&ip.extra.items[self.extra_index + padding_field_index]);
 }

 pub fn haveFieldTypes(self: @This(), ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }
Expand DownExpand Up@@ -1737,6 +1749,10 @@ pub const UnionType = struct {
 enum_tag_ty: Index,
 /// The integer tag type of the enum.
 int_tag_ty: Index,
 /// ABI size of the union, including padding
 size: u64,
 /// Trailing padding bytes
 padding: u32,
 /// List of field names in declaration order.
 field_names: NullTerminatedString.Slice,
 /// List of field types in declaration order.
Expand DownExpand Up@@ -1823,6 +1839,10 @@ pub const UnionType = struct {
 return self.flagsPtr(ip).runtime_tag.hasTag();
 }

 pub fn haveFieldTypes(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }

 pub fn haveLayout(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveLayout();
 }
Expand DownExpand Up@@ -1860,6 +1880,8 @@ pub fn loadUnionType(ip: *InternPool, key: Key.UnionType) UnionType {
 .namespace = type_union.data.namespace,
 .enum_tag_ty = enum_ty,
 .int_tag_ty = enum_info.tag_ty,
 .size = type_union.data.padding,
 .padding = type_union.data.padding,
 .field_names = enum_info.names,
 .names_map = enum_info.names_map,
 .field_types = .{
Expand DownExpand Up@@ -2925,6 +2947,10 @@ pub const Tag = enum(u8) {
 /// 1. field align: Alignment for each field; declaration order
 pub const TypeUnion = struct {
 flags: Flags,
 // Only valid after .have_layout
 size: u32,
 // Only valid after .have_layout
 padding: u32,
 decl: Module.Decl.Index,
 namespace: Module.Namespace.Index,
 /// The enum that provides the list of field names and values.
Expand All@@ -2939,7 +2965,9 @@ pub const Tag = enum(u8) {
 status: UnionType.Status,
 requires_comptime: RequiresComptime,
 assumed_runtime_bits: bool,
 _: u21 = 0,
 field_runtime_bits_wip: bool,
 alignment: Alignment,
 _: u14 = 0,
 };
 };

Expand DownExpand Up@@ -2999,11 +3027,12 @@ pub const Tag = enum(u8) {
 requires_comptime: RequiresComptime,
 is_tuple: bool,
 assumed_runtime_bits: bool,
 field_runtime_bits_wip: bool,
 has_namespace: bool,
 any_comptime_fields: bool,
 any_default_inits: bool,
 any_aligned_fields: bool,
 /// `undefined` until the layout_resolved
 /// `.none` until layout_resolved
 alignment: Alignment,
 /// Dependency loop detection when resolving struct alignment.
 alignment_wip: bool,
Expand All@@ -3018,7 +3047,7 @@ pub const Tag = enum(u8) {
 // which `layout_resolved` does not ensure.
 fully_resolved: bool,

 _: u11 = 0,
 _: u10 = 0,
 };
 };
};
Expand DownExpand Up@@ -5213,6 +5242,8 @@ pub fn getUnionType(ip: *InternPool, gpa: Allocator, ini: UnionTypeInit) Allocat

 const union_type_extra_index = ip.addExtraAssumeCapacity(Tag.TypeUnion{
 .flags = ini.flags,
 .size = std.math.maxInt(u32),
 .padding = std.math.maxInt(u32),
 .decl = ini.decl,
 .namespace = ini.namespace,
 .tag_ty = ini.enum_tag_ty,
Expand DownExpand Up@@ -5352,6 +5383,7 @@ pub fn getStructType(
 .requires_comptime = ini.requires_comptime,
 .is_tuple = ini.is_tuple,
 .assumed_runtime_bits = false,
 .field_runtime_bits_wip = false,
 .has_namespace = ini.namespace != .none,
 .any_comptime_fields = ini.any_comptime_fields,
 .any_default_inits = ini.any_default_inits,
Expand Down

50 changes: 18 additions & 32 deletions
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2504,6 +2504,8 @@ pub const CompileError = error{
 /// In a comptime scope, a break instruction was encountered. This error is only seen when
 /// evaluating a comptime block.
 ComptimeBreak,
 /// A dependency loop was detected when resolving if a field type has runtime bits
 CircularComptimeRequirementCheck,
};

pub fn init(mod: *Module) !void {
Expand DownExpand Up@@ -4791,6 +4793,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 if (opt_opv) |opv| {
Expand DownExpand Up@@ -4820,10 +4823,10 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 inner_block.error_return_trace_index = error_return_trace_index;

 sema.analyzeBody(&inner_block, fn_info.body) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };

Expand All@@ -4845,11 +4848,11 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 !sema.fn_ret_ty.isError(mod))
 {
 sema.setupErrorReturnTrace(&inner_block, last_arg_index) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
 error.ComptimeBreak => @panic("zig compiler bug: ComptimeBreak"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 }
Expand DownExpand Up@@ -4877,6 +4880,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4901,6 +4905,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4918,6 +4923,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand DownExpand Up@@ -6516,31 +6522,11 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .padding = 0,
 };
 }
 // Put the tag before or after the payload depending on which one's
 // alignment is greater.

 const tag_size = u.enum_tag_ty.toType().abiSize(mod);
 const tag_align = u.enum_tag_ty.toType().abiAlignment(mod).max(.@"1");
 var size: u64 = 0;
 var padding: u32 = undefined;
 if (tag_align.compare(.gte, payload_align)) {
 // {Tag, Payload}
 size += tag_size;
 size = payload_align.forward(size);
 size += payload_size;
 const prev_size = size;
 size = tag_align.forward(size);
 padding = @intCast(size - prev_size);
 } else {
 // {Payload, Tag}
 size += payload_size;
 size = tag_align.forward(size);
 size += tag_size;
 const prev_size = size;
 size = payload_align.forward(size);
 padding = @intCast(size - prev_size);
 }
 return .{
 .abi_size = size,
 .abi_size = u.size,
 .abi_align = tag_align.max(payload_align),
 .most_aligned_field = most_aligned_field,
 .most_aligned_field_size = most_aligned_field_size,
Expand All@@ -6549,7 +6535,7 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .payload_align = payload_align,
 .tag_align = tag_align,
 .tag_size = tag_size,
 .padding = padding,
 .padding = u.padding,
 };
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error by kcbanner · Pull Request #17490 · ziglang/zig · GitHub
Skip to content
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error#17490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kcbanner
wants to merge
1
commit into

from

 Closed


sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error
#17490
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


40 changes: 36 additions & 4 deletions
src/InternPool.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,7 @@ pub const Key = union(enum) {

 /// The returned pointer expires with any addition to the `InternPool`.
 /// Asserts the struct is not packed.
 pub fn flagsPtr(self: @This(), ip: *InternPool) *Tag.TypeStruct.Flags {
 pub fn flagsPtr(self: @This(), ip: *const InternPool) *Tag.TypeStruct.Flags {
 assert(self.layout != .Packed);
 const flags_field_index = std.meta.fieldIndex(Tag.TypeStruct, "flags").?;
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
Expand DownExpand Up@@ -688,6 +688,18 @@ pub const Key = union(enum) {
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn size(self: @This(), ip: *InternPool) *u32 {
 const size_field_index = std.meta.fieldIndex(Tag.TypeUnion, "size").?;
 return @ptrCast(&ip.extra.items[self.extra_index + size_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn padding(self: @This(), ip: *InternPool) *u32 {
 const padding_field_index = std.meta.fieldIndex(Tag.TypeUnion, "padding").?;
 return @ptrCast(&ip.extra.items[self.extra_index + padding_field_index]);
 }

 pub fn haveFieldTypes(self: @This(), ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }
Expand DownExpand Up@@ -1737,6 +1749,10 @@ pub const UnionType = struct {
 enum_tag_ty: Index,
 /// The integer tag type of the enum.
 int_tag_ty: Index,
 /// ABI size of the union, including padding
 size: u64,
 /// Trailing padding bytes
 padding: u32,
 /// List of field names in declaration order.
 field_names: NullTerminatedString.Slice,
 /// List of field types in declaration order.
Expand DownExpand Up@@ -1823,6 +1839,10 @@ pub const UnionType = struct {
 return self.flagsPtr(ip).runtime_tag.hasTag();
 }

 pub fn haveFieldTypes(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }

 pub fn haveLayout(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveLayout();
 }
Expand DownExpand Up@@ -1860,6 +1880,8 @@ pub fn loadUnionType(ip: *InternPool, key: Key.UnionType) UnionType {
 .namespace = type_union.data.namespace,
 .enum_tag_ty = enum_ty,
 .int_tag_ty = enum_info.tag_ty,
 .size = type_union.data.padding,
 .padding = type_union.data.padding,
 .field_names = enum_info.names,
 .names_map = enum_info.names_map,
 .field_types = .{
Expand DownExpand Up@@ -2925,6 +2947,10 @@ pub const Tag = enum(u8) {
 /// 1. field align: Alignment for each field; declaration order
 pub const TypeUnion = struct {
 flags: Flags,
 // Only valid after .have_layout
 size: u32,
 // Only valid after .have_layout
 padding: u32,
 decl: Module.Decl.Index,
 namespace: Module.Namespace.Index,
 /// The enum that provides the list of field names and values.
Expand All@@ -2939,7 +2965,9 @@ pub const Tag = enum(u8) {
 status: UnionType.Status,
 requires_comptime: RequiresComptime,
 assumed_runtime_bits: bool,
 _: u21 = 0,
 field_runtime_bits_wip: bool,
 alignment: Alignment,
 _: u14 = 0,
 };
 };

Expand DownExpand Up@@ -2999,11 +3027,12 @@ pub const Tag = enum(u8) {
 requires_comptime: RequiresComptime,
 is_tuple: bool,
 assumed_runtime_bits: bool,
 field_runtime_bits_wip: bool,
 has_namespace: bool,
 any_comptime_fields: bool,
 any_default_inits: bool,
 any_aligned_fields: bool,
 /// `undefined` until the layout_resolved
 /// `.none` until layout_resolved
 alignment: Alignment,
 /// Dependency loop detection when resolving struct alignment.
 alignment_wip: bool,
Expand All@@ -3018,7 +3047,7 @@ pub const Tag = enum(u8) {
 // which `layout_resolved` does not ensure.
 fully_resolved: bool,

 _: u11 = 0,
 _: u10 = 0,
 };
 };
};
Expand DownExpand Up@@ -5213,6 +5242,8 @@ pub fn getUnionType(ip: *InternPool, gpa: Allocator, ini: UnionTypeInit) Allocat

 const union_type_extra_index = ip.addExtraAssumeCapacity(Tag.TypeUnion{
 .flags = ini.flags,
 .size = std.math.maxInt(u32),
 .padding = std.math.maxInt(u32),
 .decl = ini.decl,
 .namespace = ini.namespace,
 .tag_ty = ini.enum_tag_ty,
Expand DownExpand Up@@ -5352,6 +5383,7 @@ pub fn getStructType(
 .requires_comptime = ini.requires_comptime,
 .is_tuple = ini.is_tuple,
 .assumed_runtime_bits = false,
 .field_runtime_bits_wip = false,
 .has_namespace = ini.namespace != .none,
 .any_comptime_fields = ini.any_comptime_fields,
 .any_default_inits = ini.any_default_inits,
Expand Down

50 changes: 18 additions & 32 deletions
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2504,6 +2504,8 @@ pub const CompileError = error{
 /// In a comptime scope, a break instruction was encountered. This error is only seen when
 /// evaluating a comptime block.
 ComptimeBreak,
 /// A dependency loop was detected when resolving if a field type has runtime bits
 CircularComptimeRequirementCheck,
};

pub fn init(mod: *Module) !void {
Expand DownExpand Up@@ -4791,6 +4793,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 if (opt_opv) |opv| {
Expand DownExpand Up@@ -4820,10 +4823,10 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 inner_block.error_return_trace_index = error_return_trace_index;

 sema.analyzeBody(&inner_block, fn_info.body) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };

Expand All@@ -4845,11 +4848,11 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 !sema.fn_ret_ty.isError(mod))
 {
 sema.setupErrorReturnTrace(&inner_block, last_arg_index) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
 error.ComptimeBreak => @panic("zig compiler bug: ComptimeBreak"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 }
Expand DownExpand Up@@ -4877,6 +4880,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4901,6 +4905,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4918,6 +4923,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand DownExpand Up@@ -6516,31 +6522,11 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .padding = 0,
 };
 }
 // Put the tag before or after the payload depending on which one's
 // alignment is greater.

 const tag_size = u.enum_tag_ty.toType().abiSize(mod);
 const tag_align = u.enum_tag_ty.toType().abiAlignment(mod).max(.@"1");
 var size: u64 = 0;
 var padding: u32 = undefined;
 if (tag_align.compare(.gte, payload_align)) {
 // {Tag, Payload}
 size += tag_size;
 size = payload_align.forward(size);
 size += payload_size;
 const prev_size = size;
 size = tag_align.forward(size);
 padding = @intCast(size - prev_size);
 } else {
 // {Payload, Tag}
 size += payload_size;
 size = tag_align.forward(size);
 size += tag_size;
 const prev_size = size;
 size = payload_align.forward(size);
 padding = @intCast(size - prev_size);
 }
 return .{
 .abi_size = size,
 .abi_size = u.size,
 .abi_align = tag_align.max(payload_align),
 .most_aligned_field = most_aligned_field,
 .most_aligned_field_size = most_aligned_field_size,
Expand All@@ -6549,7 +6535,7 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .payload_align = payload_align,
 .tag_align = tag_align,
 .tag_size = tag_size,
 .padding = padding,
 .padding = u.padding,
 };
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error by kcbanner · Pull Request #17490 · ziglang/zig · GitHub
Skip to content
sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error#17490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

kcbanner
wants to merge
1
commit into

from

 Closed


sema: Improvements to union and struct layout resolution to solve a false-positive circular dependency error
#17490
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


40 changes: 36 additions & 4 deletions
src/InternPool.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,7 @@ pub const Key = union(enum) {

 /// The returned pointer expires with any addition to the `InternPool`.
 /// Asserts the struct is not packed.
 pub fn flagsPtr(self: @This(), ip: *InternPool) *Tag.TypeStruct.Flags {
 pub fn flagsPtr(self: @This(), ip: *const InternPool) *Tag.TypeStruct.Flags {
 assert(self.layout != .Packed);
 const flags_field_index = std.meta.fieldIndex(Tag.TypeStruct, "flags").?;
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
Expand DownExpand Up@@ -688,6 +688,18 @@ pub const Key = union(enum) {
 return @ptrCast(&ip.extra.items[self.extra_index + flags_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn size(self: @This(), ip: *InternPool) *u32 {
 const size_field_index = std.meta.fieldIndex(Tag.TypeUnion, "size").?;
 return @ptrCast(&ip.extra.items[self.extra_index + size_field_index]);
 }

 /// The returned pointer expires with any addition to the `InternPool`.
 pub fn padding(self: @This(), ip: *InternPool) *u32 {
 const padding_field_index = std.meta.fieldIndex(Tag.TypeUnion, "padding").?;
 return @ptrCast(&ip.extra.items[self.extra_index + padding_field_index]);
 }

 pub fn haveFieldTypes(self: @This(), ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }
Expand DownExpand Up@@ -1737,6 +1749,10 @@ pub const UnionType = struct {
 enum_tag_ty: Index,
 /// The integer tag type of the enum.
 int_tag_ty: Index,
 /// ABI size of the union, including padding
 size: u64,
 /// Trailing padding bytes
 padding: u32,
 /// List of field names in declaration order.
 field_names: NullTerminatedString.Slice,
 /// List of field types in declaration order.
Expand DownExpand Up@@ -1823,6 +1839,10 @@ pub const UnionType = struct {
 return self.flagsPtr(ip).runtime_tag.hasTag();
 }

 pub fn haveFieldTypes(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveFieldTypes();
 }

 pub fn haveLayout(self: UnionType, ip: *const InternPool) bool {
 return self.flagsPtr(ip).status.haveLayout();
 }
Expand DownExpand Up@@ -1860,6 +1880,8 @@ pub fn loadUnionType(ip: *InternPool, key: Key.UnionType) UnionType {
 .namespace = type_union.data.namespace,
 .enum_tag_ty = enum_ty,
 .int_tag_ty = enum_info.tag_ty,
 .size = type_union.data.padding,
 .padding = type_union.data.padding,
 .field_names = enum_info.names,
 .names_map = enum_info.names_map,
 .field_types = .{
Expand DownExpand Up@@ -2925,6 +2947,10 @@ pub const Tag = enum(u8) {
 /// 1. field align: Alignment for each field; declaration order
 pub const TypeUnion = struct {
 flags: Flags,
 // Only valid after .have_layout
 size: u32,
 // Only valid after .have_layout
 padding: u32,
 decl: Module.Decl.Index,
 namespace: Module.Namespace.Index,
 /// The enum that provides the list of field names and values.
Expand All@@ -2939,7 +2965,9 @@ pub const Tag = enum(u8) {
 status: UnionType.Status,
 requires_comptime: RequiresComptime,
 assumed_runtime_bits: bool,
 _: u21 = 0,
 field_runtime_bits_wip: bool,
 alignment: Alignment,
 _: u14 = 0,
 };
 };

Expand DownExpand Up@@ -2999,11 +3027,12 @@ pub const Tag = enum(u8) {
 requires_comptime: RequiresComptime,
 is_tuple: bool,
 assumed_runtime_bits: bool,
 field_runtime_bits_wip: bool,
 has_namespace: bool,
 any_comptime_fields: bool,
 any_default_inits: bool,
 any_aligned_fields: bool,
 /// `undefined` until the layout_resolved
 /// `.none` until layout_resolved
 alignment: Alignment,
 /// Dependency loop detection when resolving struct alignment.
 alignment_wip: bool,
Expand All@@ -3018,7 +3047,7 @@ pub const Tag = enum(u8) {
 // which `layout_resolved` does not ensure.
 fully_resolved: bool,

 _: u11 = 0,
 _: u10 = 0,
 };
 };
};
Expand DownExpand Up@@ -5213,6 +5242,8 @@ pub fn getUnionType(ip: *InternPool, gpa: Allocator, ini: UnionTypeInit) Allocat

 const union_type_extra_index = ip.addExtraAssumeCapacity(Tag.TypeUnion{
 .flags = ini.flags,
 .size = std.math.maxInt(u32),
 .padding = std.math.maxInt(u32),
 .decl = ini.decl,
 .namespace = ini.namespace,
 .tag_ty = ini.enum_tag_ty,
Expand DownExpand Up@@ -5352,6 +5383,7 @@ pub fn getStructType(
 .requires_comptime = ini.requires_comptime,
 .is_tuple = ini.is_tuple,
 .assumed_runtime_bits = false,
 .field_runtime_bits_wip = false,
 .has_namespace = ini.namespace != .none,
 .any_comptime_fields = ini.any_comptime_fields,
 .any_default_inits = ini.any_default_inits,
Expand Down

50 changes: 18 additions & 32 deletions
src/Module.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2504,6 +2504,8 @@ pub const CompileError = error{
 /// In a comptime scope, a break instruction was encountered. This error is only seen when
 /// evaluating a comptime block.
 ComptimeBreak,
 /// A dependency loop was detected when resolving if a field type has runtime bits
 CircularComptimeRequirementCheck,
};

pub fn init(mod: *Module) !void {
Expand DownExpand Up@@ -4791,6 +4793,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 if (opt_opv) |opv| {
Expand DownExpand Up@@ -4820,10 +4823,10 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 inner_block.error_return_trace_index = error_return_trace_index;

 sema.analyzeBody(&inner_block, fn_info.body) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };

Expand All@@ -4845,11 +4848,11 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 !sema.fn_ret_ty.isError(mod))
 {
 sema.setupErrorReturnTrace(&inner_block, last_arg_index) catch |err| switch (err) {
// TODO make these unreachable instead of @panic
 error.NeededSourceLocation => @panic("zig compiler bug: NeededSourceLocation"),
 error.GenericPoison => @panic("zig compiler bug: GenericPoison"),
 error.ComptimeReturn => @panic("zig compiler bug: ComptimeReturn"),
 error.ComptimeBreak => @panic("zig compiler bug: ComptimeBreak"),
error.NeededSourceLocation => unreachable,
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 else => |e| return e,
 };
 }
Expand DownExpand Up@@ -4877,6 +4880,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4901,6 +4905,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand All@@ -4918,6 +4923,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
 error.GenericPoison => unreachable,
 error.ComptimeReturn => unreachable,
 error.ComptimeBreak => unreachable,
 error.CircularComptimeRequirementCheck => unreachable,
 error.AnalysisFail => {
 // In this case our function depends on a type that had a compile error.
 // We should not try to lower this function.
Expand DownExpand Up@@ -6516,31 +6522,11 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .padding = 0,
 };
 }
 // Put the tag before or after the payload depending on which one's
 // alignment is greater.

 const tag_size = u.enum_tag_ty.toType().abiSize(mod);
 const tag_align = u.enum_tag_ty.toType().abiAlignment(mod).max(.@"1");
 var size: u64 = 0;
 var padding: u32 = undefined;
 if (tag_align.compare(.gte, payload_align)) {
 // {Tag, Payload}
 size += tag_size;
 size = payload_align.forward(size);
 size += payload_size;
 const prev_size = size;
 size = tag_align.forward(size);
 padding = @intCast(size - prev_size);
 } else {
 // {Payload, Tag}
 size += payload_size;
 size = tag_align.forward(size);
 size += tag_size;
 const prev_size = size;
 size = payload_align.forward(size);
 padding = @intCast(size - prev_size);
 }
 return .{
 .abi_size = size,
 .abi_size = u.size,
 .abi_align = tag_align.max(payload_align),
 .most_aligned_field = most_aligned_field,
 .most_aligned_field_size = most_aligned_field_size,
Expand All@@ -6549,7 +6535,7 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
 .payload_align = payload_align,
 .tag_align = tag_align,
 .tag_size = tag_size,
 .padding = padding,
 .padding = u.padding,
 };
}

Expand Down
Loading