summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorDavid Chisnall <csdavec@swan.ac.uk>2012-04-06 15:39:12 +0000
committerDavid Chisnall <csdavec@swan.ac.uk>2012-04-06 15:39:12 +0000
commita79b469d7327bb7ed35e4454406a6ca52239d1a4 (patch)
treeffb19f0ab1191f9db0d9574768ec528176907378 /clang/lib/CodeGen
parentd12b18f8204aba938710e0d17e3eee90773feb7c (diff)
downloadbcm5719-llvm-a79b469d7327bb7ed35e4454406a6ca52239d1a4.tar.gz
bcm5719-llvm-a79b469d7327bb7ed35e4454406a6ca52239d1a4.zip
zext ivar offsets if required (GNU runtimes).
llvm-svn: 154175
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/CGObjCGNU.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGObjCGNU.cpp b/clang/lib/CodeGen/CGObjCGNU.cpp
index 54c4e655c21..68895dd93e7 100644
--- a/clang/lib/CodeGen/CGObjCGNU.cpp
+++ b/clang/lib/CodeGen/CGObjCGNU.cpp
@@ -2654,7 +2654,10 @@ llvm::Value *CGObjCGNU::EmitIvarOffset(CodeGenFunction &CGF,
Offset = new llvm::GlobalVariable(TheModule, IntTy,
false, llvm::GlobalValue::LinkOnceAnyLinkage,
llvm::Constant::getNullValue(IntTy), name);
- return CGF.Builder.CreateLoad(Offset);
+ Offset = CGF.Builder.CreateLoad(Offset);
+ if (Offset->getType() != PtrDiffTy)
+ Offset = CGF.Builder.CreateZExtOrBitCast(Offset, PtrDiffTy);
+ return Offset;
}
uint64_t Offset = ComputeIvarBaseOffset(CGF.CGM, Interface, Ivar);
return llvm::ConstantInt::get(PtrDiffTy, Offset, /*isSigned*/true);
OpenPOWER on IntegriCloud