From e83cf6a4542b34e7fd64028a3b1b89dacdc2e166 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 13 May 2021 16:48:24 -0700 Subject: Sema: detect and skip over elided instructions It would be better if AstGen would actually omit these instructions rather than only marking them as elided, but that can be solved separately. --- src/Sema.zig | 5 +++++ src/Zir.zig | 2 ++ 2 files changed, 7 insertions(+) (limited to 'src') diff --git a/src/Sema.zig b/src/Sema.zig index 626624110e..895ac84dd0 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -1461,6 +1461,11 @@ fn zirStoreToBlockPtr(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) In defer tracy.end(); const bin_inst = sema.code.instructions.items(.data)[inst].bin; + if (bin_inst.lhs == .none) { + // This is an elided instruction, but AstGen was not smart enough + // to omit it. + return; + } const ptr = try sema.resolveInst(bin_inst.lhs); const value = try sema.resolveInst(bin_inst.rhs); const ptr_ty = try sema.mod.simplePtrType(sema.arena, value.ty, true, .One); diff --git a/src/Zir.zig b/src/Zir.zig index 274098fa28..73f8e3e43b 100644 --- a/src/Zir.zig +++ b/src/Zir.zig @@ -484,6 +484,8 @@ pub const Inst = struct { /// Same as `store` but the type of the value being stored will be used to infer /// the block type. The LHS is the pointer to store to. /// Uses the `bin` union field. + /// If the pointer is none, it means this instruction has been elided in + /// AstGen, but AstGen was unable to actually omit it from the ZIR code. store_to_block_ptr, /// Same as `store` but the type of the value being stored will be used to infer /// the pointer type. -- cgit v1.2.3