mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sema: fix merge conflicts with previous commit

Browse Source 
The previous commit and e8813b296bc55a13b534bd9b2a03e1f6af366915 had
merge conflicts which didn't get caught by git.
This commit is contained in:
Andrew Kelley 2022-03-22 20:44:32 -07:00
parent e81ebc24e9
commit 8326ab7adb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Sema.zig
View File

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