motiejus/zig
1
Fork 0
Code Releases Activity

stage2: clean up break / noreturn astgen

Browse Source 
* Module.addBreak and addBreakVoid return zir.Inst.Index not Ref
   because Index is the simpler type and we never need a Ref for these.
 * astgen: make noreturn stuff return the unreachable_value and avoid
   unnecessary calls to rvalue()
 * breakExpr: avoid unnecessary access into the tokens array
 * breakExpr: fix incorrect `@intCast` (previously this unsafely
   casted an Index to a Ref)
This commit is contained in:
Andrew Kelley
2021-03-24 20:45:14 -07:00
parent ea42ab34ab
commit 01bfd835bb
3 changed files with 45 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Module.zig
View File

@@ -935,11 +935,11 @@ pub const Scope = struct {
break_count: usize = 0,
/// Tracks `break :foo bar` instructions so they can possibly be elided later if
/// the labeled block ends up not needing a result location pointer.
labeled_breaks: std.ArrayListUnmanaged(zir.Inst.Ref) = .{},
labeled_breaks: std.ArrayListUnmanaged(zir.Inst.Index) = .{},
/// Tracks `store_to_block_ptr` instructions that correspond to break instructions
/// so they can possibly be elided later if the labeled block ends up not needing
/// a result location pointer.
labeled_store_to_block_ptr_list: std.ArrayListUnmanaged(zir.Inst.Ref) = .{},
labeled_store_to_block_ptr_list: std.ArrayListUnmanaged(zir.Inst.Index) = .{},
pub const Label = struct {
token: ast.TokenIndex,
@@ -1226,8 +1226,8 @@ pub const Scope = struct {
gz: *GenZir,
break_block: zir.Inst.Index,
operand: zir.Inst.Ref,
) !zir.Inst.Ref {
return try gz.add(.{
) !zir.Inst.Index {
return gz.addAsIndex(.{
.tag = .@"break",
.data = .{ .@"break" = .{
.block_inst = break_block,
@@ -1237,15 +1237,14 @@ pub const Scope = struct {
}
pub fn addBreakVoid(
inner_gz: *GenZir,
block_gz: *GenZir,
gz: *GenZir,
break_block: zir.Inst.Index,
node_index: ast.Node.Index,
) !zir.Inst.Ref {
return try inner_gz.add(.{
) !zir.Inst.Index {
return gz.addAsIndex(.{
.tag = .break_void_node,
.data = .{ .break_void_node = .{
.src_node = block_gz.zir_code.decl.nodeIndexToRelative(node_index),
.src_node = gz.zir_code.decl.nodeIndexToRelative(node_index),
.block_inst = break_block,
} },
});
@@ -1339,6 +1338,10 @@ pub const Scope = struct {
}
pub fn add(gz: *GenZir, inst: zir.Inst) !zir.Inst.Ref {
return gz.zir_code.indexToRef(try gz.addAsIndex(inst));
}
pub fn addAsIndex(gz: *GenZir, inst: zir.Inst) !zir.Inst.Index {
const gpa = gz.zir_code.gpa;
try gz.instructions.ensureCapacity(gpa, gz.instructions.items.len + 1);
try gz.zir_code.instructions.ensureCapacity(gpa, gz.zir_code.instructions.len + 1);
@@ -1346,7 +1349,7 @@ pub const Scope = struct {
const new_index = @intCast(zir.Inst.Index, gz.zir_code.instructions.len);
gz.zir_code.instructions.appendAssumeCapacity(inst);
gz.instructions.appendAssumeCapacity(new_index);
return gz.zir_code.indexToRef(new_index);
return new_index;
}
};