3 files changed, 10 insertions, 5 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp
index 3baeb8dd28..6d45c517d1 100644
--- a/lib/CodeGen/CGCall.cpp
+++ b/lib/CodeGen/CGCall.cpp
@@ -396,7 +396,8 @@ llvm::Value *CodeGenFunction::EmitCallArgPtr(const Expr *E) {
 
 
 llvm::CallInst *CodeGenFunction::EmitRuntimeCall(llvm::Value *Func) {
-  auto Result = Builder.CreateCall(Func);
+  llvm::Value *Args[] = {};
+  auto Result = Builder.CreateCall(Func, Args);
   Result->setCallingConv(CGM.getRuntimeCC());
   return Result;
 }
@@ -408,7 +409,8 @@ llvm::CallInst *CodeGenFunction::EmitRuntimeCall(llvm::Value *Func, llvm::ArrayR
 }
 
 llvm::CallInst *CodeGenFunction::EmitRuntimeCall2(llvm::Value *Func, llvm::Value *A1, llvm::Value *A2) {
-  auto Result = Builder.CreateCall2(Func, A1, A2);
+  llvm::Value *Args[] = {A1, A2};
+  auto Result = Builder.CreateCall(Func, Args);
   Result->setCallingConv(CGM.getRuntimeCC());
   return Result;
 }
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 6ddcc2b592..d8c7ed8c35 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -189,7 +189,8 @@ llvm::Value *CodeGenFunction::EmitScalarBinaryExpr(BinaryExpr::Operator Op,
     auto Func = GetIntrinsicFunction(Intrinsic,
                                      LHS->getType(),
                                      RHS->getType());
-    Result = Builder.CreateCall2(Func, LHS, RHS);
+    llvm::Value *PowerArgs[] = {LHS, RHS};
+    Result = Builder.CreateCall(Func, PowerArgs);
     break;
   }
 
diff --git a/lib/CodeGen/CGIntrinsic.cpp b/lib/CodeGen/CGIntrinsic.cpp
index 1c9dba11e9..87094df981 100644
--- a/lib/CodeGen/CGIntrinsic.cpp
+++ b/lib/CodeGen/CGIntrinsic.cpp
@@ -259,8 +259,10 @@ llvm::Value* CodeGenFunction::EmitIntrinsicCallScalarMath(intrinsic::FunctionKin
   default:
     llvm_unreachable("invalid scalar math intrinsic");
   }
-  if(A2)
-    return Builder.CreateCall2(FuncDecl, A1, A2);
+  if(A2) {
+    llvm::Value *Args[] = {A1, A2};
+    return Builder.CreateCall(FuncDecl, Args);
+  }
   return Builder.CreateCall(FuncDecl, A1);
 }