[llvm-branch-commits] [cfe-branch] r128165 - in /cfe/branches/release_29: ./ lib/CodeGen/CGObjCGNU.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Wed Mar 23 16:01:08 2011
New Revision: 128165

URL: http://llvm.org/viewvc/llvm-project?rev=128165&view=rev
Log:
--- Merging r128102 into '.':
U    lib/CodeGen/CGObjCGNU.cpp


Modified:
    cfe/branches/release_29/   (props changed)
    cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp
    cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 23 16:01:08 2011
@@ -1,3 +1,3 @@
-/cfe/trunk:127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980
+/cfe/trunk:127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980,128102
 /cfe/trunk/test/SemaTemplate:126920
 /llvm/trunk:127238,127329,127652,127654-127655

Modified: cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp?rev=128165&r1=128164&r2=128165&view=diff
==============================================================================
--- cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp (original)
+++ cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp Wed Mar 23 16:01:08 2011
@@ -2451,11 +2451,13 @@
                          const ObjCIvarDecl *Ivar) {
   if (CGM.getLangOptions().ObjCNonFragileABI) {
     Interface = FindIvarInterface(CGM.getContext(), Interface, Ivar);
-    return CGF.Builder.CreateLoad(CGF.Builder.CreateLoad(
-                ObjCIvarOffsetVariable(Interface, Ivar), false, "ivar"));
+    return CGF.Builder.CreateZExtOrBitCast(
+        CGF.Builder.CreateLoad(CGF.Builder.CreateLoad(
+                ObjCIvarOffsetVariable(Interface, Ivar), false, "ivar")),
+        PtrDiffTy);
   }
   uint64_t Offset = ComputeIvarBaseOffset(CGF.CGM, Interface, Ivar);
-  return llvm::ConstantInt::get(LongTy, Offset, "ivar");
+  return llvm::ConstantInt::get(PtrDiffTy, Offset, "ivar");
 }
 
 CodeGen::CGObjCRuntime *

Propchange: cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 23 16:01:08 2011
@@ -1 +1 @@
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980,128102