The difference between the head of:

https://github.com/CodethinkLabs/flang.git

and the first commit of:

https://github.com/llvm-flang/flang.git

as of 14/08/2015

1 files changed, 10 insertions, 4 deletions

diff --git a/lib/CodeGen/CGExprComplex.cpp b/lib/CodeGen/CGExprComplex.cpp
index 05e310ef11..2a6a8ebaaf 100644
--- a/lib/CodeGen/CGExprComplex.cpp
+++ b/lib/CodeGen/CGExprComplex.cpp
@@ -62,15 +62,21 @@ ComplexValueTy ComplexExprEmitter::VisitComplexConstantExpr(const ComplexConstan
 }
 
 ComplexValueTy CodeGenFunction::EmitComplexLoad(llvm::Value *Ptr, bool IsVolatile) {
-  auto Re = Builder.CreateLoad(Builder.CreateStructGEP(Ptr,0), IsVolatile);
-  auto Im = Builder.CreateLoad(Builder.CreateStructGEP(Ptr,1), IsVolatile);
+  auto Re = Builder.CreateLoad(Builder.CreateStructGEP(Ptr->getType(),
+                                                       Ptr,
+                                                       0), IsVolatile);
+  auto Im = Builder.CreateLoad(Builder.CreateStructGEP(Ptr->getType(),
+                                                       Ptr,
+                                                       1), IsVolatile);
   return ComplexValueTy(Re, Im);
 }
 
 void CodeGenFunction::EmitComplexStore(ComplexValueTy Value, llvm::Value *Ptr,
                                        bool IsVolatile) {
-  Builder.CreateStore(Value.Re, Builder.CreateStructGEP(Ptr,0), IsVolatile);
-  Builder.CreateStore(Value.Im, Builder.CreateStructGEP(Ptr,1), IsVolatile);
+  Builder.CreateStore(Value.Re, Builder.CreateStructGEP(Ptr->getType(),
+                                                        Ptr,0), IsVolatile);
+  Builder.CreateStore(Value.Im, Builder.CreateStructGEP(Ptr->getType(),
+                                                        Ptr,1), IsVolatile);
 }
 
 ComplexValueTy ComplexExprEmitter::VisitVarExpr(const VarExpr *E) {