[cfe-commits] r66321 - in /cfe/trunk/lib/CodeGen: CGExprScalar.cpp CGObjCMac.cpp

[Eli Friedman]

Author: efriedma
Date: Fri Mar  6 21:57:15 2009
New Revision: 66321

URL: http://llvm.org/viewvc/llvm-project?rev=66321&view=rev
Log:
Back out the patch in r66302, and re-fix it properly.  We assume for 
performance that the type of the returned llvm::Value for an expression 
matches the converted type of the clang::Expr; mismatches will cause all
sorts of errors and silent miscompilations.


Modified:
    cfe/trunk/lib/CodeGen/CGExprScalar.cpp
    cfe/trunk/lib/CodeGen/CGObjCMac.cpp

Modified: cfe/trunk/lib/CodeGen/CGExprScalar.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprScalar.cpp?rev=66321&r1=66320&r2=66321&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprScalar.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprScalar.cpp Fri Mar  6 21:57:15 2009
@@ -1015,9 +1015,6 @@
                                   LHS, RHS, "cmp");
     } else {
       // Unsigned integers and pointers.
-      // Casting becomes necessary with -fobjc-gc as one or the other my turn
-      // into an 'id' type due to generation of read barriers.
-      RHS = Builder.CreateBitCast(RHS, LHS->getType());
       Result = Builder.CreateICmp((llvm::ICmpInst::Predicate)UICmpOpc,
                                   LHS, RHS, "cmp");
     }

Modified: cfe/trunk/lib/CodeGen/CGObjCMac.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjCMac.cpp?rev=66321&r1=66320&r2=66321&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGObjCMac.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGObjCMac.cpp Fri Mar  6 21:57:15 2009
@@ -2177,9 +2177,12 @@
 llvm::Value * CGObjCMac::EmitObjCWeakRead(CodeGen::CodeGenFunction &CGF,
                                           llvm::Value *AddrWeakObj)
 {
+  const llvm::Type* DestTy =
+      cast<llvm::PointerType>(AddrWeakObj->getType())->getElementType();
   AddrWeakObj = CGF.Builder.CreateBitCast(AddrWeakObj, ObjCTypes.PtrObjectPtrTy); 
   llvm::Value *read_weak = CGF.Builder.CreateCall(ObjCTypes.GcReadWeakFn,
                                                   AddrWeakObj, "weakread");
+  read_weak = CGF.Builder.CreateBitCast(read_weak, DestTy);
   return read_weak;
 }
 
@@ -4766,9 +4769,12 @@
                                           CodeGen::CodeGenFunction &CGF,
                                           llvm::Value *AddrWeakObj)
 {
+  const llvm::Type* DestTy =
+      cast<llvm::PointerType>(AddrWeakObj->getType())->getElementType();
   AddrWeakObj = CGF.Builder.CreateBitCast(AddrWeakObj, ObjCTypes.PtrObjectPtrTy); 
   llvm::Value *read_weak = CGF.Builder.CreateCall(ObjCTypes.GcReadWeakFn,
                                                   AddrWeakObj, "weakread");
+  read_weak = CGF.Builder.CreateBitCast(read_weak, DestTy);
   return read_weak;
 }