[cfe-commits] r111723 - in /cfe/trunk/lib/CodeGen: CGValue.h CodeGenFunction.h

[Daniel Dunbar]

Author: ddunbar
Date: Fri Aug 20 22:58:45 2010
New Revision: 111723

URL: http://llvm.org/viewvc/llvm-project?rev=111723&view=rev
Log:
IRgen/CGValue: Give MakeAddrLValue() an alignment argument, and eliminate old form of MakeAddr().

Modified:
    cfe/trunk/lib/CodeGen/CGValue.h
    cfe/trunk/lib/CodeGen/CodeGenFunction.h

Modified: cfe/trunk/lib/CodeGen/CGValue.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGValue.h?rev=111723&r1=111722&r2=111723&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGValue.h (original)
+++ cfe/trunk/lib/CodeGen/CGValue.h Fri Aug 20 22:58:45 2010
@@ -251,8 +251,11 @@
     return KVCRefExpr;
   }
 
-  static LValue MakeAddr(llvm::Value *V, Qualifiers Quals,
-                         unsigned Alignment = 0) {
+  static LValue MakeAddr(llvm::Value *V, QualType T, unsigned Alignment,
+                         ASTContext &Context) {
+    Qualifiers Quals = Context.getCanonicalType(T).getQualifiers();
+    Quals.setObjCGCAttr(Context.getObjCGCAttrKind(T));
+
     LValue R;
     R.LVType = Simple;
     R.V = V;
@@ -260,13 +263,6 @@
     return R;
   }
 
-  static LValue MakeAddr(llvm::Value *V, QualType T, ASTContext &Context) {
-    Qualifiers Quals = Context.getCanonicalType(T).getQualifiers();
-    Quals.setObjCGCAttr(Context.getObjCGCAttrKind(T));
-
-    return MakeAddr(V, Quals);
-  }
-
   static LValue MakeVectorElt(llvm::Value *Vec, llvm::Value *Idx,
                               unsigned CVR) {
     LValue R;

Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=111723&r1=111722&r2=111723&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Fri Aug 20 22:58:45 2010
@@ -976,7 +976,7 @@
   }
 
   LValue MakeAddrLValue(llvm::Value *V, QualType T) {
-    return LValue::MakeAddr(V, T, getContext());
+    return LValue::MakeAddr(V, T, 0, getContext());
   }
 
   /// CreateTempAlloca - This creates a alloca and inserts it into the entry