Commit 8326ab7adb

Andrew Kelley <andrew@ziglang.org>
2022-03-23 04:44:32
Sema: fix merge conflicts with previous commit
The previous commit and e8813b296bc55a13b534bd9b2a03e1f6af366915 had merge conflicts which didn't get caught by git.
master
1 parent e81ebc2
Changed files (1)
src
Sema.zig
src/Sema.zig
@@ -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);