summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Osmialowski <pawelo@king.net.pl>2015-10-15 21:13:14 +0200
committerCraig Griffiths <craig.griffiths@codethink.co.uk>2015-10-26 17:49:20 +0000
commit1fcc9afe174653a49376bddda0421d590587d4bf (patch)
treeb42cfc1e3435e2c05af3fa3964a7749a56aedb00
parent02acaaaf730194f061f9e9527243909ec09d7bee (diff)
downloadflang-1fcc9afe174653a49376bddda0421d590587d4bf.tar.gz
Follow LLVM API changes (CreateStructGEP()).
Signed-off-by: Paul Osmialowski <pawelo@king.net.pl>
-rw-r--r--lib/CodeGen/CGExprAgg.cpp2
-rw-r--r--lib/CodeGen/CGExprComplex.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index 77bf5564b4..6705026935 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -94,7 +94,7 @@ void CodeGenFunction::EmitAggregateAssignment(const Expr *LHS, const Expr *RHS)
}
llvm::Value *CodeGenFunction::EmitAggregateMember(llvm::Value *Agg, const FieldDecl *Field) {
- return Builder.CreateStructGEP(Agg->getType(), Agg, Field->getIndex());
+ return Builder.CreateStructGEP(nullptr, Agg, Field->getIndex());
}
void CodeGenFunction::EmitAggregateReturn(const CGFunctionInfo::RetInfo &Info, llvm::Value *Ptr) {
diff --git a/lib/CodeGen/CGExprComplex.cpp b/lib/CodeGen/CGExprComplex.cpp
index 2a6a8ebaaf..b85a0129da 100644
--- a/lib/CodeGen/CGExprComplex.cpp
+++ b/lib/CodeGen/CGExprComplex.cpp
@@ -62,10 +62,10 @@ ComplexValueTy ComplexExprEmitter::VisitComplexConstantExpr(const ComplexConstan
}
ComplexValueTy CodeGenFunction::EmitComplexLoad(llvm::Value *Ptr, bool IsVolatile) {
- auto Re = Builder.CreateLoad(Builder.CreateStructGEP(Ptr->getType(),
+ auto Re = Builder.CreateLoad(Builder.CreateStructGEP(nullptr,
Ptr,
0), IsVolatile);
- auto Im = Builder.CreateLoad(Builder.CreateStructGEP(Ptr->getType(),
+ auto Im = Builder.CreateLoad(Builder.CreateStructGEP(nullptr,
Ptr,
1), IsVolatile);
return ComplexValueTy(Re, Im);
@@ -73,9 +73,9 @@ ComplexValueTy CodeGenFunction::EmitComplexLoad(llvm::Value *Ptr, bool IsVolatil
void CodeGenFunction::EmitComplexStore(ComplexValueTy Value, llvm::Value *Ptr,
bool IsVolatile) {
- Builder.CreateStore(Value.Re, Builder.CreateStructGEP(Ptr->getType(),
+ Builder.CreateStore(Value.Re, Builder.CreateStructGEP(nullptr,
Ptr,0), IsVolatile);
- Builder.CreateStore(Value.Im, Builder.CreateStructGEP(Ptr->getType(),
+ Builder.CreateStore(Value.Im, Builder.CreateStructGEP(nullptr,
Ptr,1), IsVolatile);
}