4 files changed, 8 insertions, 10 deletions
diff --git a/clang/test/CodeGen/builtin-memfns.c b/clang/test/CodeGen/builtin-memfns.c
index e8c407fd6f2..a7b716b931c 100644
--- a/clang/test/CodeGen/builtin-memfns.c
+++ b/clang/test/CodeGen/builtin-memfns.c
@@ -1,11 +1,9 @@
-// RUN: %clang_cc1 -triple i386-pc-linux-gnu -emit-llvm < %s| FileCheck %s
+// RUN: %clang_cc1 -triple i386-pc-linux-gnu -emit-llvm -o %t %s
+// RUN: grep '@llvm.memset.i32' %t
+// RUN: grep '@llvm.memcpy.i32' %t
+// RUN: grep '@llvm.memmove.i32' %t
+// RUN: grep __builtin %t | count 0
 
-// CHECK: call void @llvm.memset.p0i8.i32
-// CHECK: call void @llvm.memset.p0i8.i32
-// CHECK: call void @llvm.memcpy.p0i8.p0i8.i32
-// CHECK: call void @llvm.memmove.p0i8.p0i8.i32
-// CHECK-NOT: __builtin
-// CHECK: ret
 int main(int argc, char **argv) {
   unsigned char a = 0x11223344;
   unsigned char b = 0x11223344;
diff --git a/clang/test/CodeGenCXX/eh.cpp b/clang/test/CodeGenCXX/eh.cpp
index afd9da69864..d233525f0a4 100644
--- a/clang/test/CodeGenCXX/eh.cpp
+++ b/clang/test/CodeGenCXX/eh.cpp
@@ -15,7 +15,7 @@ void test1() {
 // CHECK-NEXT:  store i8* %{{exception|2}}, i8** %{{exception.ptr|1}}
 // CHECK-NEXT:  %{{0|3}} = bitcast i8* %{{exception|2}} to %struct.test1_D*
 // CHECK-NEXT:  %{{tmp|4}} = bitcast %struct.test1_D* %{{0|3}} to i8*
-// CHECK-NEXT:  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %{{tmp|4}}, i8* bitcast (%struct.test1_D* @d1 to i8*), i64 8, i32 8, i1 false)
+// CHECK-NEXT:  call void @llvm.memcpy.i64(i8* %{{tmp|4}}, i8* bitcast (%struct.test1_D* @d1 to i8*), i64 8, i32 8)
 // CHECK-NEXT:  call void @__cxa_throw(i8* %{{exception|2}}, i8* bitcast (%0* @_ZTI7test1_D to i8*), i8* null) noreturn
 // CHECK-NEXT:  unreachable
 
diff --git a/clang/test/CodeGenCXX/new.cpp b/clang/test/CodeGenCXX/new.cpp
index ca7c52f2cc0..6ea12eb5f6b 100644
--- a/clang/test/CodeGenCXX/new.cpp
+++ b/clang/test/CodeGenCXX/new.cpp
@@ -93,6 +93,6 @@ A* t10() {
 struct B { };
 void t11() {
   // CHECK: call noalias i8* @_Znwm
-  // CHECK: call void @llvm.memset.p0i8.i64(
+  // CHECK: call void @llvm.memset.i64(
   B* b = new B();
 }
diff --git a/clang/test/CodeGenCXX/value-init.cpp b/clang/test/CodeGenCXX/value-init.cpp
index 37891bd6af6..8b6e43fd8ec 100644
--- a/clang/test/CodeGenCXX/value-init.cpp
+++ b/clang/test/CodeGenCXX/value-init.cpp
@@ -18,7 +18,7 @@ void test_value_init() {
   // PR5800
 
   // CHECK: store i32 17
-  // CHECK: call void @llvm.memset.p0i8.i64
+  // CHECK: call void @llvm.memset.i64
   // CHECK: call void @_ZN1BC1Ev
   C c = { 17 } ;
   // CHECK: call void @_ZN1CD1Ev