[cfe-commits] r135567 - in /cfe/trunk/lib/CodeGen: CGExpr.cpp CGExprScalar.cpp

[Chris Lattner]

Author: lattner
Date: Tue Jul 19 23:59:57 2011
New Revision: 135567

URL: http://llvm.org/viewvc/llvm-project?rev=135567&view=rev
Log:
as eli points out, we're not doing memory stuff here.  While ConvertType 
and ConvertTypeForMem are the same for pointers, it is best to just
use ConvertType.  Thanks Eli!


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

Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=135567&r1=135566&r2=135567&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExpr.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExpr.cpp Tue Jul 19 23:59:57 2011
@@ -174,7 +174,7 @@
 }
 
 static llvm::Value *
-CreateReferenceTemporary(CodeGenFunction& CGF, QualType Type,
+CreateReferenceTemporary(CodeGenFunction &CGF, QualType Type,
                          const NamedDecl *InitializedDecl) {
   if (const VarDecl *VD = dyn_cast_or_null<VarDecl>(InitializedDecl)) {
     if (VD->hasGlobalStorage()) {

Modified: cfe/trunk/lib/CodeGen/CGExprScalar.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprScalar.cpp?rev=135567&r1=135566&r2=135567&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprScalar.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprScalar.cpp Tue Jul 19 23:59:57 2011
@@ -1077,8 +1077,7 @@
 
     // Make sure the array decay ends up being the right type.  This matters if
     // the array type was of an incomplete type.
-    return CGF.Builder.CreateBitCast(V, 
-                              CGF.getTypes().ConvertTypeForMem(CE->getType()));
+    return CGF.Builder.CreateBitCast(V, ConvertType(CE->getType()));
   }
   case CK_FunctionToPointerDecay:
     return EmitLValue(E).getAddress();