From 8326ab7adb92aff11d19b21a6d42869a361b462b Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Tue, 22 Mar 2022 20:44:32 -0700
Subject: [PATCH] Sema: fix merge conflicts with previous commit

The previous commit and e8813b296bc55a13b534bd9b2a03e1f6af366915 had
merge conflicts which didn't get caught by git.
---
 src/Sema.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);