authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-03-22 20:44:32-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-03-22 20:44:32-07:00
log8326ab7adb92aff11d19b21a6d42869a361b462b
treea00d577d78d578feb6d5699ce15d09f31a21dffb
parente81ebc24e9abf96a6ffbb42cd00587e32e80f23c

Sema: fix merge conflicts with previous commit

The previous commit and e8813b296bc55a13b534bd9b2a03e1f6af366915 had merge conflicts which didn't get caught by git.

1 files changed, 1 insertions(+), 1 deletions(-)

src/Sema.zig+1-1
...@@ -19871,7 +19871,7 @@ fn analyzeSlice(...@@ -19871,7 +19871,7 @@ fn analyzeSlice(
19871 if (try sema.resolveDefinedValue(block, src, ptr_or_slice)) |slice_val| {19871 if (try sema.resolveDefinedValue(block, src, ptr_or_slice)) |slice_val| {
19872 // we don't need to add one for sentinels because the19872 // we don't need to add one for sentinels because the
19873 // underlying value data includes the sentinel19873 // underlying value data includes the sentinel
19874 break :blk try sema.addIntUnsigned(Type.usize, slice_val.sliceLen());19874 break :blk try sema.addIntUnsigned(Type.usize, slice_val.sliceLen(target));
19875 }19875 }
1987619876
19877 const slice_len_inst = try block.addTyOp(.slice_len, Type.usize, ptr_or_slice);19877 const slice_len_inst = try block.addTyOp(.slice_len, Type.usize, ptr_or_slice);