authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-06-20 13:44:24-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-06-20 14:02:09-04:00
logd7bd4f339c90b9ce07283600cb7ef129912ceef3
treeff3d181923df575edd51562397f60c93eff8d8e7
parent6b56f4ff0bf9ac9c5e0b4a11cf0536472447bc4a

Sema: optimize value resolution

3 files changed, 53 insertions(+), 44 deletions(-)

src/InternPool.zig+33
......@@ -622,6 +622,8 @@ pub const Key = union(enum) {
622622 len: Index = .none,
623623
624624 pub const Addr = union(enum) {
625 const Tag = @typeInfo(Addr).Union.tag_type.?;
626
625627 decl: Module.Decl.Index,
626628 mut_decl: MutDecl,
627629 comptime_field: Index,
......@@ -5702,10 +5704,18 @@ pub fn isNoReturn(ip: *const InternPool, ty: Index) bool {
57025704 };
57035705}
57045706
5707pub fn isUndef(ip: *const InternPool, val: Index) bool {
5708 return val == .undef or ip.items.items(.tag)[@intFromEnum(val)] == .undef;
5709}
5710
57055711pub fn isRuntimeValue(ip: *const InternPool, val: Index) bool {
57065712 return ip.items.items(.tag)[@intFromEnum(val)] == .runtime_value;
57075713}
57085714
5715pub fn isVariable(ip: *const InternPool, val: Index) bool {
5716 return ip.items.items(.tag)[@intFromEnum(val)] == .variable;
5717}
5718
57095719pub fn getBackingDecl(ip: *const InternPool, val: Index) Module.Decl.OptionalIndex {
57105720 var base = @intFromEnum(val);
57115721 while (true) {
......@@ -5730,6 +5740,29 @@ pub fn getBackingDecl(ip: *const InternPool, val: Index) Module.Decl.OptionalInd
57305740 }
57315741}
57325742
5743pub fn getBackingAddrTag(ip: *const InternPool, val: Index) ?Key.Ptr.Addr.Tag {
5744 var base = @intFromEnum(val);
5745 while (true) {
5746 switch (ip.items.items(.tag)[base]) {
5747 .ptr_decl => return .decl,
5748 .ptr_mut_decl => return .mut_decl,
5749 .ptr_comptime_field => return .comptime_field,
5750 .ptr_int => return .int,
5751 inline .ptr_eu_payload,
5752 .ptr_opt_payload,
5753 .ptr_elem,
5754 .ptr_field,
5755 => |tag| base = ip.extra.items[
5756 ip.items.items(.data)[base] + std.meta.fieldIndex(tag.Payload(), "base").?
5757 ],
5758 inline .ptr_slice => |tag| base = ip.extra.items[
5759 ip.items.items(.data)[base] + std.meta.fieldIndex(tag.Payload(), "ptr").?
5760 ],
5761 else => return null,
5762 }
5763 }
5764}
5765
57335766/// This is a particularly hot function, so we operate directly on encodings
57345767/// rather than the more straightforward implementation of calling `indexToKey`.
57355768pub fn zigTypeTagOrPoison(ip: *const InternPool, index: Index) error{GenericPoison}!std.builtin.TypeId {
src/Sema.zig+19-38
......@@ -1898,13 +1898,10 @@ fn resolveConstMaybeUndefVal(
18981898 reason: []const u8,
18991899) CompileError!Value {
19001900 if (try sema.resolveMaybeUndefValAllowVariables(inst)) |val| {
1901 switch (val.toIntern()) {
1902 .generic_poison => return error.GenericPoison,
1903 else => switch (sema.mod.intern_pool.indexToKey(val.toIntern())) {
1904 .variable => return sema.failWithNeededComptime(block, src, reason),
1905 else => return val,
1906 },
1907 }
1901 if (val.isGenericPoison()) return error.GenericPoison;
1902 if (sema.mod.intern_pool.isVariable(val.toIntern()))
1903 return sema.failWithNeededComptime(block, src, reason);
1904 return val;
19081905 }
19091906 return sema.failWithNeededComptime(block, src, reason);
19101907}
......@@ -1919,15 +1916,11 @@ fn resolveConstValue(
19191916 reason: []const u8,
19201917) CompileError!Value {
19211918 if (try sema.resolveMaybeUndefValAllowVariables(air_ref)) |val| {
1922 switch (val.toIntern()) {
1923 .generic_poison => return error.GenericPoison,
1924 .undef => return sema.failWithUseOfUndef(block, src),
1925 else => switch (sema.mod.intern_pool.indexToKey(val.toIntern())) {
1926 .undef => return sema.failWithUseOfUndef(block, src),
1927 .variable => return sema.failWithNeededComptime(block, src, reason),
1928 else => return val,
1929 },
1930 }
1919 if (val.isGenericPoison()) return error.GenericPoison;
1920 if (val.isUndef(sema.mod)) return sema.failWithUseOfUndef(block, src);
1921 if (sema.mod.intern_pool.isVariable(val.toIntern()))
1922 return sema.failWithNeededComptime(block, src, reason);
1923 return val;
19311924 }
19321925 return sema.failWithNeededComptime(block, src, reason);
19331926}
......@@ -1971,14 +1964,9 @@ fn resolveMaybeUndefVal(
19711964 inst: Air.Inst.Ref,
19721965) CompileError!?Value {
19731966 const val = (try sema.resolveMaybeUndefValAllowVariables(inst)) orelse return null;
1974 switch (val.ip_index) {
1975 .generic_poison => return error.GenericPoison,
1976 .none => return val,
1977 else => switch (sema.mod.intern_pool.indexToKey(val.toIntern())) {
1978 .variable => return null,
1979 else => return val,
1980 },
1981 }
1967 if (val.isGenericPoison()) return error.GenericPoison;
1968 if (val.ip_index != .none and sema.mod.intern_pool.isVariable(val.toIntern())) return null;
1969 return val;
19821970}
19831971
19841972/// Value Tag `variable` causes this function to return `null`.
......@@ -2002,20 +1990,13 @@ fn resolveMaybeUndefValIntable(
20021990 inst: Air.Inst.Ref,
20031991) CompileError!?Value {
20041992 const val = (try sema.resolveMaybeUndefValAllowVariables(inst)) orelse return null;
2005 var check = val;
2006 while (true) switch (check.ip_index) {
2007 .generic_poison => return error.GenericPoison,
2008 .none => break,
2009 else => switch (sema.mod.intern_pool.indexToKey(check.toIntern())) {
2010 .variable => return null,
2011 .ptr => |ptr| switch (ptr.addr) {
2012 .decl, .mut_decl, .comptime_field => return null,
2013 .int => break,
2014 .eu_payload, .opt_payload => |base| check = base.toValue(),
2015 .elem, .field => |base_index| check = base_index.base.toValue(),
2016 },
2017 else => break,
2018 },
1993 if (val.isGenericPoison()) return error.GenericPoison;
1994 if (val.ip_index == .none) return val;
1995 if (sema.mod.intern_pool.isVariable(val.toIntern())) return null;
1996 if (sema.mod.intern_pool.getBackingAddrTag(val.toIntern())) |addr| switch (addr) {
1997 .decl, .mut_decl, .comptime_field => return null,
1998 .int => {},
1999 .eu_payload, .opt_payload, .elem, .field => unreachable,
20192000 };
20202001 return try sema.resolveLazyValue(val);
20212002}
src/value.zig+1-6
......@@ -1991,12 +1991,7 @@ pub const Value = struct {
19911991 }
19921992
19931993 pub fn isUndef(val: Value, mod: *Module) bool {
1994 if (val.ip_index == .none) return false;
1995 return switch (mod.intern_pool.indexToKey(val.toIntern())) {
1996 .undef => true,
1997 .simple_value => |v| v == .undefined,
1998 else => false,
1999 };
1994 return val.ip_index != .none and mod.intern_pool.isUndef(val.toIntern());
20001995 }
20011996
20021997 /// TODO: check for cases such as array that is not marked undef but all the element