Skip to content

Commit

Permalink
Sema: remove some incorrect calls to requireRuntimeBlock
Browse files Browse the repository at this point in the history 
Most calls to `requireRuntimeBlock` in Sema are not correct. This
function doesn't deal with all of them, but it does deal with ones which
have, in combination with the past few commits, introduced real-world
regressions.

Related: ziglang#22353
  • Loading branch information
@mlugg
mlugg committed Dec 30, 2024
1 parent 11b6f61 commit 52f00b4
Showing 1 changed file with 21 additions and 55 deletions.
76 changes: 21 additions & 55 deletions src/Sema.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14621,7 +14621,7 @@ fn zirShl(
}),
} },
});
const ov_bit = try sema.tupleFieldValByIndex(block, src, op_ov, 1, op_ov_tuple_ty);
const ov_bit = try sema.tupleFieldValByIndex(block, op_ov, 1, op_ov_tuple_ty);
const any_ov_bit = if (lhs_ty.zigTypeTag(zcu) == .vector)
try block.addInst(.{
.tag = if (block.float_mode == .optimized) .reduce_optimized else .reduce,
Expand All @@ -14636,7 +14636,7 @@ fn zirShl(
const no_ov = try block.addBinOp(.cmp_eq, any_ov_bit, zero_ov);

try sema.addSafetyCheck(block, src, no_ov, .shl_overflow);
return sema.tupleFieldValByIndex(block, src, op_ov, 0, op_ov_tuple_ty);
return sema.tupleFieldValByIndex(block, op_ov, 0, op_ov_tuple_ty);
}
}
return block.addBinOp(air_tag, lhs, new_rhs);
Expand Down Expand Up @@ -14964,20 +14964,12 @@ fn analyzeTupleCat(
const element_refs = try sema.arena.alloc(Air.Inst.Ref, final_len);
var i: u32 = 0;
while (i < lhs_len) : (i += 1) {
const operand_src = block.src(.{ .array_cat_lhs = .{
.array_cat_offset = src_node,
.elem_index = i,
} });
element_refs[i] = try sema.tupleFieldValByIndex(block, operand_src, lhs, i, lhs_ty);
element_refs[i] = try sema.tupleFieldValByIndex(block, lhs, i, lhs_ty);
}
i = 0;
while (i < rhs_len) : (i += 1) {
const operand_src = block.src(.{ .array_cat_rhs = .{
.array_cat_offset = src_node,
.elem_index = i,
} });
element_refs[i + lhs_len] =
try sema.tupleFieldValByIndex(block, operand_src, rhs, i, rhs_ty);
try sema.tupleFieldValByIndex(block, rhs, i, rhs_ty);
}

return block.addAggregateInit(Type.fromInterned(tuple_ty), element_refs);
Expand Down Expand Up @@ -15395,11 +15387,7 @@ fn analyzeTupleMul(
const element_refs = try sema.arena.alloc(Air.Inst.Ref, final_len);
var i: u32 = 0;
while (i < tuple_len) : (i += 1) {
const operand_src = block.src(.{ .array_cat_lhs = .{
.array_cat_offset = src_node,
.elem_index = i,
} });
element_refs[i] = try sema.tupleFieldValByIndex(block, operand_src, operand, @intCast(i), operand_ty);
element_refs[i] = try sema.tupleFieldValByIndex(block, operand, @intCast(i), operand_ty);
}
i = 1;
while (i < factor) : (i += 1) {
Expand Down Expand Up @@ -17497,7 +17485,7 @@ fn analyzeArithmetic(
}),
} },
});
const ov_bit = try sema.tupleFieldValByIndex(block, src, op_ov, 1, op_ov_tuple_ty);
const ov_bit = try sema.tupleFieldValByIndex(block, op_ov, 1, op_ov_tuple_ty);
const any_ov_bit = if (resolved_type.zigTypeTag(zcu) == .vector)
try block.addInst(.{
.tag = if (block.float_mode == .optimized) .reduce_optimized else .reduce,
Expand All @@ -17512,7 +17500,7 @@ fn analyzeArithmetic(
const no_ov = try block.addBinOp(.cmp_eq, any_ov_bit, zero_ov);

try sema.addSafetyCheck(block, src, no_ov, .integer_overflow);
return sema.tupleFieldValByIndex(block, src, op_ov, 0, op_ov_tuple_ty);
return sema.tupleFieldValByIndex(block, op_ov, 0, op_ov_tuple_ty);
}
}
}
Expand Down Expand Up @@ -25720,7 +25708,7 @@ fn zirBuiltinCall(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError

const resolved_args: []Air.Inst.Ref = try sema.arena.alloc(Air.Inst.Ref, args_ty.structFieldCount(zcu));
for (resolved_args, 0..) |*resolved, i| {
resolved.* = try sema.tupleFieldValByIndex(block, args_src, args, @intCast(i), args_ty);
resolved.* = try sema.tupleFieldValByIndex(block, args, @intCast(i), args_ty);
}

const callee_ty = sema.typeOf(func);
Expand Down Expand Up @@ -28108,7 +28096,7 @@ fn fieldVal(
const field_ptr = try sema.structFieldPtr(block, src, object, field_name, field_name_src, inner_ty, false);
return sema.analyzeLoad(block, src, field_ptr, object_src);
} else {
return sema.structFieldVal(block, src, object, field_name, field_name_src, inner_ty);
return sema.structFieldVal(block, object, field_name, field_name_src, inner_ty);
},
.@"union" => if (is_pointer_to) {
// Avoid loading the entire union by fetching a pointer and loading that
Expand Down Expand Up @@ -28728,14 +28716,12 @@ fn structFieldPtrByIndex(
return Air.internedToRef(val);
}

try sema.requireRuntimeBlock(block, src, null);
return block.addStructFieldPtr(struct_ptr, field_index, ptr_field_ty);
}

fn structFieldVal(
sema: *Sema,
block: *Block,
src: LazySrcLoc,
struct_byval: Air.Inst.Ref,
field_name: InternPool.NullTerminatedString,
field_name_src: LazySrcLoc,
Expand Down Expand Up @@ -28771,12 +28757,11 @@ fn structFieldVal(
return Air.internedToRef((try struct_val.fieldValue(pt, field_index)).toIntern());
}

try sema.requireRuntimeBlock(block, src, null);
try field_ty.resolveLayout(pt);
return block.addStructFieldVal(struct_byval, field_index, field_ty);
},
.tuple_type => {
return sema.tupleFieldVal(block, src, struct_byval, field_name, field_name_src, struct_ty);
return sema.tupleFieldVal(block, struct_byval, field_name, field_name_src, struct_ty);
},
else => unreachable,
}
Expand All @@ -28785,7 +28770,6 @@ fn structFieldVal(
fn tupleFieldVal(
sema: *Sema,
block: *Block,
src: LazySrcLoc,
tuple_byval: Air.Inst.Ref,
field_name: InternPool.NullTerminatedString,
field_name_src: LazySrcLoc,
Expand All @@ -28797,7 +28781,7 @@ fn tupleFieldVal(
return pt.intRef(Type.usize, tuple_ty.structFieldCount(zcu));
}
const field_index = try sema.tupleFieldIndex(block, tuple_ty, field_name, field_name_src);
return sema.tupleFieldValByIndex(block, src, tuple_byval, field_index, tuple_ty);
return sema.tupleFieldValByIndex(block, tuple_byval, field_index, tuple_ty);
}

/// Asserts that `field_name` is not "len".
Expand Down Expand Up @@ -28826,7 +28810,6 @@ fn tupleFieldIndex(
fn tupleFieldValByIndex(
sema: *Sema,
block: *Block,
src: LazySrcLoc,
tuple_byval: Air.Inst.Ref,
field_index: u32,
tuple_ty: Type,
Expand Down Expand Up @@ -28856,7 +28839,6 @@ fn tupleFieldValByIndex(
};
}

try sema.requireRuntimeBlock(block, src, null);
try field_ty.resolveLayout(pt);
return block.addStructFieldVal(tuple_byval, field_index, field_ty);
}
Expand Down Expand Up @@ -28954,7 +28936,6 @@ fn unionFieldPtr(
return Air.internedToRef(field_ptr_val.toIntern());
}

try sema.requireRuntimeBlock(block, src, null);
if (!initializing and union_obj.flagsUnordered(ip).layout == .auto and block.wantSafety() and
union_ty.unionTagTypeSafety(zcu) != null and union_obj.field_types.len > 1)
{
Expand Down Expand Up @@ -29031,7 +29012,6 @@ fn unionFieldVal(
}
}

try sema.requireRuntimeBlock(block, src, null);
if (union_obj.flagsUnordered(ip).layout == .auto and block.wantSafety() and
union_ty.unionTagTypeSafety(zcu) != null and union_obj.field_types.len > 1)
{
Expand Down Expand Up @@ -29110,16 +29090,15 @@ fn elemPtrOneLayerOnly(
.Many, .C => {
const maybe_ptr_val = try sema.resolveDefinedValue(block, indexable_src, indexable);
const maybe_index_val = try sema.resolveDefinedValue(block, elem_index_src, elem_index);
const runtime_src = rs: {
const ptr_val = maybe_ptr_val orelse break :rs indexable_src;
const index_val = maybe_index_val orelse break :rs elem_index_src;
ct: {
const ptr_val = maybe_ptr_val orelse break :ct;
const index_val = maybe_index_val orelse break :ct;
const index: usize = @intCast(try index_val.toUnsignedIntSema(pt));
const elem_ptr = try ptr_val.ptrElem(index, pt);
return Air.internedToRef(elem_ptr.toIntern());
};
}
const result_ty = try indexable_ty.elemPtrType(null, pt);

try sema.requireRuntimeBlock(block, src, runtime_src);
return block.addPtrElemPtr(indexable, elem_index, result_ty);
},
.One => {
Expand Down Expand Up @@ -29167,22 +29146,19 @@ fn elemVal(
const maybe_indexable_val = try sema.resolveDefinedValue(block, indexable_src, indexable);
const maybe_index_val = try sema.resolveDefinedValue(block, elem_index_src, elem_index);

const runtime_src = rs: {
const indexable_val = maybe_indexable_val orelse break :rs indexable_src;
const index_val = maybe_index_val orelse break :rs elem_index_src;
ct: {
const indexable_val = maybe_indexable_val orelse break :ct;
const index_val = maybe_index_val orelse break :ct;
const index: usize = @intCast(try index_val.toUnsignedIntSema(pt));
const elem_ty = indexable_ty.elemType2(zcu);
const many_ptr_ty = try pt.manyConstPtrType(elem_ty);
const many_ptr_val = try pt.getCoerced(indexable_val, many_ptr_ty);
const elem_ptr_ty = try pt.singleConstPtrType(elem_ty);
const elem_ptr_val = try many_ptr_val.ptrElem(index, pt);
if (try sema.pointerDeref(block, indexable_src, elem_ptr_val, elem_ptr_ty)) |elem_val| {
return Air.internedToRef((try pt.getCoerced(elem_val, elem_ty)).toIntern());
}
break :rs indexable_src;
};
const elem_val = try sema.pointerDeref(block, indexable_src, elem_ptr_val, elem_ptr_ty) orelse break :ct;
return Air.internedToRef((try pt.getCoerced(elem_val, elem_ty)).toIntern());
}

try sema.requireRuntimeBlock(block, src, runtime_src);
return block.addBinOp(.ptr_elem_val, indexable, elem_index);
},
.One => {
Expand Down Expand Up @@ -29295,7 +29271,6 @@ fn tupleFieldPtr(
try sema.validateRuntimeElemAccess(block, field_index_src, field_ty, tuple_ty, tuple_ptr_src);
}

try sema.requireRuntimeBlock(block, tuple_ptr_src, null);
return block.addStructFieldPtr(tuple_ptr, field_index, ptr_field_ty);
}

Expand Down Expand Up @@ -29338,7 +29313,6 @@ fn tupleField(

try sema.validateRuntimeElemAccess(block, field_index_src, field_ty, tuple_ty, tuple_src);

try sema.requireRuntimeBlock(block, tuple_src, null);
try field_ty.resolveLayout(pt);
return block.addStructFieldVal(tuple, field_index, field_ty);
}
Expand Down Expand Up @@ -29394,7 +29368,6 @@ fn elemValArray(

try sema.validateRuntimeElemAccess(block, elem_index_src, elem_ty, array_ty, array_src);

const runtime_src = if (maybe_undef_array_val != null) elem_index_src else array_src;
if (oob_safety and block.wantSafety()) {
// Runtime check is only needed if unable to comptime check.
if (maybe_index_val == null) {
Expand All @@ -29407,7 +29380,6 @@ fn elemValArray(
if (try sema.typeHasOnePossibleValue(elem_ty)) |elem_val|
return Air.internedToRef(elem_val.toIntern());

try sema.requireRuntimeBlock(block, src, runtime_src);
return block.addBinOp(.array_elem_val, array, elem_index);
}

Expand Down Expand Up @@ -29461,9 +29433,6 @@ fn elemPtrArray(
try sema.validateRuntimeElemAccess(block, elem_index_src, array_ty.elemType2(zcu), array_ty, array_ptr_src);
}

const runtime_src = if (maybe_undef_array_ptr_val != null) elem_index_src else array_ptr_src;
try sema.requireRuntimeBlock(block, src, runtime_src);

// Runtime check is only needed if unable to comptime check.
if (oob_safety and block.wantSafety() and offset == null) {
const len_inst = try pt.intRef(Type.usize, array_len);
Expand Down Expand Up @@ -29520,7 +29489,6 @@ fn elemValSlice(

try sema.validateRuntimeElemAccess(block, elem_index_src, elem_ty, slice_ty, slice_src);

try sema.requireRuntimeBlock(block, src, runtime_src);
if (oob_safety and block.wantSafety()) {
const len_inst = if (maybe_slice_val) |slice_val|
try pt.intRef(Type.usize, try slice_val.sliceLen(pt))
Expand Down Expand Up @@ -29577,8 +29545,6 @@ fn elemPtrSlice(

try sema.validateRuntimeElemAccess(block, elem_index_src, elem_ptr_ty, slice_ty, slice_src);

const runtime_src = if (maybe_undef_slice_val != null) elem_index_src else slice_src;
try sema.requireRuntimeBlock(block, src, runtime_src);
if (oob_safety and block.wantSafety()) {
const len_inst = len: {
if (maybe_undef_slice_val) |slice_val|
Expand Down

0 comments on commit 52f00b4

Please sign in to comment.