diff --git a/llvm/test/Transforms/InstCombine/strcpy-nonzero-as.ll b/llvm/test/Transforms/InstCombine/strcpy-nonzero-as.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/Transforms/InstCombine/strcpy-nonzero-as.ll
@@ -0,0 +1,89 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes
+; Test that the strcpy library call simplifier also works when the string
+; libcall arguments are in a non-zero address space.
+; RUN: sed -e 's/addrspace(200)/addrspace(0)/g' -e 's/-A200-P200-G200//g' %s
+; RUN: sed -e 's/addrspace(200)/addrspace(0)/g' -e 's/-A200-P200-G200//g' %s \
+; RUN:   | opt -instcombine -S | FileCheck %s --check-prefix=CHECK-AS0
+; RUN: opt < %s -instcombine -S
+; RUN: opt < %s -instcombine -S | FileCheck %s --check-prefix=CHECK-AS200
+target datalayout = "e-m:e-p200:128:128:128:64-p:64:64-A200-P200-G200"
+
+@str = private unnamed_addr addrspace(200) constant [17 x i8] c"exactly 16 chars\00", align 1
+
+declare i8 addrspace(200)* @strcpy(i8 addrspace(200)*, i8 addrspace(200)*) addrspace(200)
+declare i8 addrspace(200)* @stpcpy(i8 addrspace(200)*, i8 addrspace(200)*) addrspace(200)
+declare i8 addrspace(200)* @strncpy(i8 addrspace(200)*, i8 addrspace(200)*, i64) addrspace(200)
+declare i8 addrspace(200)* @stpncpy(i8 addrspace(200)*, i8 addrspace(200)*, i64) addrspace(200)
+
+define void @test_strcpy_to_memcpy(i8 addrspace(200)* %dst) addrspace(200) nounwind {
+; CHECK-AS0-LABEL: define {{[^@]+}}@test_strcpy_to_memcpy
+; CHECK-AS0-SAME: (i8* [[DST:%.*]]) [[ATTR0:#.*]] {
+; CHECK-AS0-NEXT:  entry:
+; CHECK-AS0-NEXT:    call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 1 dereferenceable(17) [[DST]], i8* nonnull align 1 dereferenceable(17) getelementptr inbounds ([17 x i8], [17 x i8]* @str, i64 0, i64 0), i64 17, i1 false)
+; CHECK-AS0-NEXT:    ret void
+;
+; CHECK-AS200-LABEL: define {{[^@]+}}@test_strcpy_to_memcpy
+; CHECK-AS200-SAME: (i8 addrspace(200)* [[DST:%.*]]) addrspace(200) [[ATTR0:#.*]] {
+; CHECK-AS200-NEXT:  entry:
+; CHECK-AS200-NEXT:    [[CALL:%.*]] = call addrspace(200) i8 addrspace(200)* @strcpy(i8 addrspace(200)* [[DST]], i8 addrspace(200)* getelementptr inbounds ([17 x i8], [17 x i8] addrspace(200)* @str, i64 0, i64 0))
+; CHECK-AS200-NEXT:    ret void
+;
+entry:
+  %call = call i8 addrspace(200)* @strcpy(i8 addrspace(200)* %dst, i8 addrspace(200)* getelementptr inbounds ([17 x i8], [17 x i8] addrspace(200)* @str, i64 0, i64 0))
+  ret void
+}
+
+define void @test_stpcpy_to_memcpy(i8 addrspace(200)* %dst) addrspace(200) nounwind {
+; CHECK-AS0-LABEL: define {{[^@]+}}@test_stpcpy_to_memcpy
+; CHECK-AS0-SAME: (i8* [[DST:%.*]]) [[ATTR0]] {
+; CHECK-AS0-NEXT:  entry:
+; CHECK-AS0-NEXT:    call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 1 dereferenceable(17) [[DST]], i8* nonnull align 1 dereferenceable(17) getelementptr inbounds ([17 x i8], [17 x i8]* @str, i64 0, i64 0), i64 17, i1 false)
+; CHECK-AS0-NEXT:    ret void
+;
+; CHECK-AS200-LABEL: define {{[^@]+}}@test_stpcpy_to_memcpy
+; CHECK-AS200-SAME: (i8 addrspace(200)* [[DST:%.*]]) addrspace(200) [[ATTR0]] {
+; CHECK-AS200-NEXT:  entry:
+; CHECK-AS200-NEXT:    [[CALL:%.*]] = call addrspace(200) i8 addrspace(200)* @stpcpy(i8 addrspace(200)* [[DST]], i8 addrspace(200)* getelementptr inbounds ([17 x i8], [17 x i8] addrspace(200)* @str, i64 0, i64 0))
+; CHECK-AS200-NEXT:    ret void
+;
+entry:
+  %call = call i8 addrspace(200)* @stpcpy(i8 addrspace(200)* %dst, i8 addrspace(200)* getelementptr inbounds ([17 x i8], [17 x i8] addrspace(200)* @str, i64 0, i64 0))
+  ret void
+}
+
+define void @test_strncpy_to_memcpy(i8 addrspace(200)* %dst) addrspace(200) nounwind {
+; CHECK-AS0-LABEL: define {{[^@]+}}@test_strncpy_to_memcpy
+; CHECK-AS0-SAME: (i8* [[DST:%.*]]) [[ATTR0]] {
+; CHECK-AS0-NEXT:  entry:
+; CHECK-AS0-NEXT:    call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 1 dereferenceable(17) [[DST]], i8* nonnull align 1 dereferenceable(17) getelementptr inbounds ([17 x i8], [17 x i8]* @str, i64 0, i64 0), i64 17, i1 false)
+; CHECK-AS0-NEXT:    ret void
+;
+; CHECK-AS200-LABEL: define {{[^@]+}}@test_strncpy_to_memcpy
+; CHECK-AS200-SAME: (i8 addrspace(200)* [[DST:%.*]]) addrspace(200) [[ATTR0]] {
+; CHECK-AS200-NEXT:  entry:
+; CHECK-AS200-NEXT:    [[CALL:%.*]] = call addrspace(200) i8 addrspace(200)* @strncpy(i8 addrspace(200)* [[DST]], i8 addrspace(200)* getelementptr inbounds ([17 x i8], [17 x i8] addrspace(200)* @str, i64 0, i64 0), i64 17)
+; CHECK-AS200-NEXT:    ret void
+;
+entry:
+  %call = call i8 addrspace(200)* @strncpy(i8 addrspace(200)* %dst, i8 addrspace(200)* getelementptr inbounds ([17 x i8], [17 x i8] addrspace(200)* @str, i64 0, i64 0), i64 17)
+  ret void
+}
+
+; Note: stpncpy is not handled by SimplifyLibcalls yet, so this should not be changed.
+define void @test_stpncpy_to_memcpy(i8 addrspace(200)* %dst) addrspace(200) nounwind {
+; CHECK-AS0-LABEL: define {{[^@]+}}@test_stpncpy_to_memcpy
+; CHECK-AS0-SAME: (i8* [[DST:%.*]]) [[ATTR0]] {
+; CHECK-AS0-NEXT:  entry:
+; CHECK-AS0-NEXT:    [[CALL:%.*]] = call i8* @stpncpy(i8* [[DST]], i8* getelementptr inbounds ([17 x i8], [17 x i8]* @str, i64 0, i64 0), i64 17)
+; CHECK-AS0-NEXT:    ret void
+;
+; CHECK-AS200-LABEL: define {{[^@]+}}@test_stpncpy_to_memcpy
+; CHECK-AS200-SAME: (i8 addrspace(200)* [[DST:%.*]]) addrspace(200) [[ATTR0]] {
+; CHECK-AS200-NEXT:  entry:
+; CHECK-AS200-NEXT:    [[CALL:%.*]] = call addrspace(200) i8 addrspace(200)* @stpncpy(i8 addrspace(200)* [[DST]], i8 addrspace(200)* getelementptr inbounds ([17 x i8], [17 x i8] addrspace(200)* @str, i64 0, i64 0), i64 17)
+; CHECK-AS200-NEXT:    ret void
+;
+entry:
+  %call = call i8 addrspace(200)* @stpncpy(i8 addrspace(200)* %dst, i8 addrspace(200)* getelementptr inbounds ([17 x i8], [17 x i8] addrspace(200)* @str, i64 0, i64 0), i64 17)
+  ret void
+}