commit 6614845b4f6724da8c6aca14ea720dbd157883a7
author David Chisnall <csdavec@swan.ac.uk> Fri Apr 06 15:39:12 2012 +0000
committer David Chisnall <csdavec@swan.ac.uk> Fri Apr 06 15:39:12 2012 +0000
tree 1f5e0a63da7fc0645a8a5bd588ad0bd1bfc6a847
parent cf2fa2f0c9d67adb98b282ec0eaa88f08df29804

zext ivar offsets if required (GNU runtimes).


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154175 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGObjCGNU.cpp

diff --git a/lib/CodeGen/CGObjCGNU.cpp b/lib/CodeGen/CGObjCGNU.cpp
index 54c4e65..68895dd 100644
--- a/lib/CodeGen/CGObjCGNU.cpp
+++ b/lib/CodeGen/CGObjCGNU.cpp
@@ -2654,7 +2654,10 @@
       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);