__clear_cache() is varargs and people will occasionally write it without

arguments. Process only the arguments that people write, but process
all of them.

Fixes rdar://8900346

llvm-svn: 127616

2 files changed, 28 insertions, 4 deletions

diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index 5eeb605f18e..7e61b50c93d 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -1116,13 +1116,16 @@ Value *CodeGenFunction::EmitARMBuiltinExpr(unsigned BuiltinID,
                                            const CallExpr *E) {
   if (BuiltinID == ARM::BI__clear_cache) {
     const FunctionDecl *FD = E->getDirectCallee();
-    Value *a = EmitScalarExpr(E->getArg(0));
-    Value *b = EmitScalarExpr(E->getArg(1));
+    // Oddly people write this call without args on occasion and gcc accepts
+    // it - it's also marked as varargs in the description file.
+    llvm::SmallVector<Value*, 2> Ops;
+    for (unsigned i = 0; i < E->getNumArgs(); i++)
+      Ops.push_back(EmitScalarExpr(E->getArg(i)));
     const llvm::Type *Ty = CGM.getTypes().ConvertType(FD->getType());
     const llvm::FunctionType *FTy = cast<llvm::FunctionType>(Ty);
     llvm::StringRef Name = FD->getName();
-    return Builder.CreateCall2(CGM.CreateRuntimeFunction(FTy, Name),
-                               a, b);
+    return Builder.CreateCall(CGM.CreateRuntimeFunction(FTy, Name),
+                              Ops.begin(), Ops.end());
   }
 
   llvm::SmallVector<Value*, 4> Ops;
diff --git a/clang/test/CodeGen/arm-clear.c b/clang/test/CodeGen/arm-clear.c
new file mode 100644
index 00000000000..eda64ce99ee
--- /dev/null
+++ b/clang/test/CodeGen/arm-clear.c
@@ -0,0 +1,21 @@
+// RUN: %clang_cc1 -triple armv7-apple-darwin9 -emit-llvm -w -o - %s | FileCheck %s
+
+void clear0(void *ptr) {
+  // CHECK: clear0
+  // CHECK-NOT: load i8**
+  __clear_cache();
+}
+
+void clear1(void *ptr) {
+  // CHECK: clear1
+  // CHECK: load i8**
+  // CHECK-NOT: load i8**
+  __clear_cache(ptr);
+}
+
+void clear2(void *ptr, void *ptr2) {
+  // CHECK: clear2
+  // CHECK: load i8**
+  // CHECK: load i8**
+  __clear_cache(ptr, ptr2);
+}