aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2022-03-22 20:44:32 -0700
committerAndrew Kelley <andrew@ziglang.org>2022-03-22 20:44:32 -0700
commit8326ab7adb92aff11d19b21a6d42869a361b462b (patch)
treea00d577d78d578feb6d5699ce15d09f31a21dffb /src
parente81ebc24e9abf96a6ffbb42cd00587e32e80f23c (diff)
downloadzig-8326ab7adb92aff11d19b21a6d42869a361b462b.tar.gz
zig-8326ab7adb92aff11d19b21a6d42869a361b462b.zip
Sema: fix merge conflicts with previous commit
The previous commit and e8813b296bc55a13b534bd9b2a03e1f6af366915 had merge conflicts which didn't get caught by git.
Diffstat (limited to 'src')
-rw-r--r--src/Sema.zig2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Sema.zig b/src/Sema.zig
index 96fabc197f..dd9f2d74d8 100644
--- a/src/Sema.zig
+++ b/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);