@@ -1193,7 +1193,7 @@ fn analyzeBodyInner(
11931193 .elem_ptr => try sema.zirElemPtr(block, inst),
11941194 .elem_ptr_node => try sema.zirElemPtrNode(block, inst),
11951195 .elem_val => try sema.zirElemVal(block, inst),
1196- .elem_val_node => try sema.zirElemValNode (block, inst),
1196+ .elem_ptr_load => try sema.zirElemPtrLoad (block, inst),
11971197 .elem_val_imm => try sema.zirElemValImm(block, inst),
11981198 .elem_type => try sema.zirElemType(block, inst),
11991199 .indexable_ptr_elem_type => try sema.zirIndexablePtrElemType(block, inst),
@@ -10095,18 +10095,19 @@ fn zirElemVal(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air
1009510095 return sema.elemVal(block, src, array, elem_index, src, false);
1009610096}
1009710097
10098- fn zirElemValNode (sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {
10098+ fn zirElemPtrLoad (sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {
1009910099 const tracy = trace(@src());
1010010100 defer tracy.end();
1010110101
1010210102 const inst_data = sema.code.instructions.items(.data)[@intFromEnum(inst)].pl_node;
1010310103 const src = block.nodeOffset(inst_data.src_node);
1010410104 const elem_index_src = block.src(.{ .node_offset_array_access_index = inst_data.src_node });
1010510105 const extra = sema.code.extraData(Zir.Inst.Bin, inst_data.payload_index).data;
10106- const array = try sema.resolveInst(extra.lhs);
10106+ const array_ptr = try sema.resolveInst(extra.lhs);
1010710107 const uncoerced_elem_index = try sema.resolveInst(extra.rhs);
1010810108 const elem_index = try sema.coerce(block, .usize, uncoerced_elem_index, elem_index_src);
10109- return sema.elemVal(block, src, array, elem_index, elem_index_src, true);
10109+ const elem_ptr = try elemPtr(sema, block, src, array_ptr, elem_index, elem_index_src, false, true);
10110+ return analyzeLoad(sema, block, src, elem_ptr, elem_index_src);
1011010111}
1011110112
1011210113fn zirElemValImm(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {
0 commit comments