motiejus/zig
1
Fork 0
Code Releases Activity

Eliminate switch_capture and switch_capture_ref ZIR tags

Browse Source 
These tags are unnecessary, as this information can be more efficiently
encoded within the switch_block instruction itself. We also use a neat
little trick to avoid needing a dummy instruction (like is used for
errdefer captures): since the switch_block itself cannot otherwise be
referenced within a prong, we can repurpose its index within prongs to
refer to the captured value.
This commit is contained in:
mlugg
2023-05-26 04:10:51 +01:00
parent cebd80032a
commit 00609e7edb
5 changed files with 565 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Module.zig
View File

@@ -5871,6 +5871,7 @@ pub const SwitchProngSrc = union(enum) {
multi: Multi,
range: Multi,
multi_capture: u32,
special,
pub const Multi = struct {
prong: u32,
@@ -5908,14 +5909,22 @@ pub const SwitchProngSrc = union(enum) {
var scalar_i: u32 = 0;
for (case_nodes) |case_node| {
const case = tree.fullSwitchCase(case_node).?;
if (case.ast.values.len == 0)
continue;
if (case.ast.values.len == 1 and
node_tags[case.ast.values[0]] == .identifier and
mem.eql(u8, tree.tokenSlice(main_tokens[case.ast.values[0]]), "_"))
{
continue;
const is_special = special: {
if (case.ast.values.len == 0) break :special true;
if (case.ast.values.len == 1 and node_tags[case.ast.values[0]] == .identifier) {
break :special mem.eql(u8, tree.tokenSlice(main_tokens[case.ast.values[0]]), "_");
}
break :special false;
};
if (is_special) {
if (prong_src != .special) continue;
return LazySrcLoc.nodeOffset(
decl.nodeIndexToRelative(case.ast.values[0]),
);
}
const is_multi = case.ast.values.len != 1 or
node_tags[case.ast.values[0]] == .switch_range;
@@ -5956,6 +5965,7 @@ pub const SwitchProngSrc = union(enum) {
range_i += 1;
} else unreachable;
},
.special => {},
}
if (is_multi) {
multi_i += 1;