6 files changed, 8 insertions, 9 deletions
diff --git a/clang/test/CodeGen/builtin-expect.c b/clang/test/CodeGen/builtin-expect.c
index 664c6b6a470..73b3b24be8f 100644
--- a/clang/test/CodeGen/builtin-expect.c
+++ b/clang/test/CodeGen/builtin-expect.c
@@ -18,7 +18,7 @@ int main() {
 }
 
 // CHECK: call void @isigprocmask()
-// CHECK: [[C:%.*]] = call i64 (...)* @bar()
+// CHECK: [[C:%.*]] = call i64 bitcast (i64 (...)* @bar to i64 ()*)()
 
 
 // CHECK: @test1
diff --git a/clang/test/CodeGen/functions.c b/clang/test/CodeGen/functions.c
index e51f93e5741..28e4bd0c829 100644
--- a/clang/test/CodeGen/functions.c
+++ b/clang/test/CodeGen/functions.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -emit-llvm -o - -verify | FileCheck %s
+// RUN: %clang_cc1 %s -triple i386-unknown-unknown -emit-llvm -o - -verify | FileCheck %s
 
 int g();
 
@@ -24,7 +24,7 @@ void f0() {}
 
 void f1();
 void f2(void) {
-// CHECK: call void @f1()
+// CHECK: call void bitcast (void ()* @f1 to void (i32, i32, i32)*)(i32 1, i32 2, i32 3)
   f1(1, 2, 3);
 }
 // CHECK: define void @f1()
diff --git a/clang/test/CodeGen/kr-call.c b/clang/test/CodeGen/kr-call.c
index 97068bce0cd..ea4e3d3d70f 100644
--- a/clang/test/CodeGen/kr-call.c
+++ b/clang/test/CodeGen/kr-call.c
@@ -2,11 +2,10 @@
 
 // Test that we don't crash.  The s390x-unknown-linux target happens
 // to need to set a sext argument attribute on this call, and we need
-// to make sure that rewriting it correctly drops that attribute when
-// also dropping the spurious argument.
+// to make sure that rewriting it correctly keeps that attribute.
 void test0_helper();
 void test0() {
-  // CHECK: call void @test0_helper()
+  // CHECK: call void bitcast (void ()* @test0_helper to void (i32)*)(i32 signext 1)
   test0_helper(1);
 }
 void test0_helper() {}
diff --git a/clang/test/CodeGen/microsoft-call-conv.c b/clang/test/CodeGen/microsoft-call-conv.c
index 95f5fa3f83b..390c3be05e6 100644
--- a/clang/test/CodeGen/microsoft-call-conv.c
+++ b/clang/test/CodeGen/microsoft-call-conv.c
@@ -46,5 +46,5 @@ int main(void) {
 void __stdcall f7(foo) int foo; {}
 void f8(void) {
   f7(0);
-  // CHECK: call x86_stdcallcc void (...)* bitcast
+  // CHECK: call x86_stdcallcc void @f7(i32 0)
 }
diff --git a/clang/test/CodeGen/mrtd.c b/clang/test/CodeGen/mrtd.c
index 2cc71bb0086..d7729a52506 100644
--- a/clang/test/CodeGen/mrtd.c
+++ b/clang/test/CodeGen/mrtd.c
@@ -4,7 +4,7 @@ void baz(int arg);
 
 // CHECK: define x86_stdcallcc void @foo(i32 %arg) nounwind
 void foo(int arg) {
-// CHECK: call x86_stdcallcc i32 (...)* @bar(i32
+// CHECK: call x86_stdcallcc i32 bitcast (i32 (...)* @bar to i32 (i32)*)(
   bar(arg);
 // CHECK: call x86_stdcallcc void @baz(i32
   baz(arg);
diff --git a/clang/test/CodeGen/stdcall-fastcall.c b/clang/test/CodeGen/stdcall-fastcall.c
index 6f3b0032877..3de7b6727bc 100644
--- a/clang/test/CodeGen/stdcall-fastcall.c
+++ b/clang/test/CodeGen/stdcall-fastcall.c
@@ -46,5 +46,5 @@ int main(void) {
 void __attribute((stdcall)) f7(foo) int foo; {}
 void f8(void) {
   f7(0);
-  // CHECK: call x86_stdcallcc void (...)* bitcast
+  // CHECK: call x86_stdcallcc void @f7(i32 0)
 }