summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlo Bertolli <cbertol@us.ibm.com>2015-05-20 13:35:33 -0400
committerCraig Griffiths <craig.griffiths@codethink.co.uk>2015-08-14 10:38:13 +0100
commitde4492dde2e9dba97df190311a4978a62922e1b0 (patch)
tree34957f066b464f7f0daf92707057868c47241128
parent1fbbe48084e48648d69423854663f5a10d9fd2c0 (diff)
downloadflang-de4492dde2e9dba97df190311a4978a62922e1b0.tar.gz
Fix code style of previous patch
-rw-r--r--lib/CodeGen/CGCall.cpp6
-rw-r--r--lib/CodeGen/CGExprScalar.cpp3
-rw-r--r--lib/CodeGen/CGIntrinsic.cpp6
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);
}