summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Osmialowski <pawelo@king.net.pl>2015-10-18 09:07:54 +0200
committerCraig Griffiths <craig.griffiths@codethink.co.uk>2015-10-26 17:49:28 +0000
commit60db5d3bd7c288379ee4a2158c9c29441a25fefa (patch)
tree5525df9704c4bfcb611bef05bcc1f719caf5819d
parent1fcc9afe174653a49376bddda0421d590587d4bf (diff)
downloadflang-60db5d3bd7c288379ee4a2158c9c29441a25fefa.tar.gz
Follow LLVM API changes (CreateConstInBoundsGEP*()).
Signed-off-by: Paul Osmialowski <pawelo@king.net.pl>
-rw-r--r--lib/CodeGen/CGDecl.cpp2
-rw-r--r--lib/CodeGen/CGSystemLibflang.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp
index ac46af410a..919cb66b41 100644
--- a/lib/CodeGen/CGDecl.cpp
+++ b/lib/CodeGen/CGDecl.cpp
@@ -102,7 +102,7 @@ void CodeGenFunction::EmitVarInitializer(const VarDecl *D) {
auto T = D->getType();
if(T->isArrayType()) {
auto Dest = Builder.CreateConstInBoundsGEP2_32(ConvertTypeForMem(T),
- GetVarPtr(D), 0, 0, NULL );
+ GetVarPtr(D), 0, 0);
auto Init = cast<ArrayConstructorExpr>(D->getInit())->getItems();
for(size_t I = 0; I < Init.size(); ++I) {
auto Val = EmitRValue(Init[I]);
diff --git a/lib/CodeGen/CGSystemLibflang.cpp b/lib/CodeGen/CGSystemLibflang.cpp
index 9929e86d0f..ecfd89bb7f 100644
--- a/lib/CodeGen/CGSystemLibflang.cpp
+++ b/lib/CodeGen/CGSystemLibflang.cpp
@@ -61,7 +61,7 @@ llvm::Value *CGLibflangSystemRuntime::EmitETIME(CodeGenFunction &CGF, ArrayRef<E
CGF.EmitCallArg(ArgList, Arr, Func.getInfo()->getArguments()[0]);
CGF.EmitCallArg(ArgList,
CGF.getBuilder().CreateConstInBoundsGEP1_32(
- CGF.ConvertTypeForMem(RealTy),Arr, 1, NULL),
+ CGF.ConvertTypeForMem(RealTy),Arr, 1),
Func.getInfo()->getArguments()[1]);
return CGF.EmitCall(Func.getFunction(), Func.getInfo(), ArgList).asScalar();
}