[cfe-commits] r102845 - in /cfe/trunk/lib/CodeGen: CGClass.cpp CodeGenFunction.h

[Anders Carlsson]

Author: andersca
Date: Sat May  1 11:49:43 2010
New Revision: 102845

URL: http://llvm.org/viewvc/llvm-project?rev=102845&view=rev
Log:
Get rid of a parameter from EmitClassMemberwiseCopy.

Modified:
    cfe/trunk/lib/CodeGen/CGClass.cpp
    cfe/trunk/lib/CodeGen/CodeGenFunction.h

Modified: cfe/trunk/lib/CodeGen/CGClass.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGClass.cpp?rev=102845&r1=102844&r2=102845&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGClass.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGClass.cpp Sat May  1 11:49:43 2010
@@ -594,7 +594,7 @@
 void CodeGenFunction::EmitClassMemberwiseCopy(
                         llvm::Value *Dest, llvm::Value *Src,
                         const CXXRecordDecl *ClassDecl,
-                        const CXXRecordDecl *BaseClassDecl, QualType Ty) {
+                        const CXXRecordDecl *BaseClassDecl) {
   CXXCtorType CtorType = Ctor_Complete;
   
   if (ClassDecl) {
@@ -605,7 +605,7 @@
     CtorType = Ctor_Base;
   }
   if (BaseClassDecl->hasTrivialCopyConstructor()) {
-    EmitAggregateCopy(Dest, Src, Ty);
+    EmitAggregateCopy(Dest, Src, getContext().getTagDeclType(BaseClassDecl));
     return;
   }
 
@@ -718,7 +718,7 @@
       }
       else
         EmitClassMemberwiseCopy(LHS.getAddress(), RHS.getAddress(),
-                                0 /*ClassDecl*/, FieldClassDecl, FieldType);
+                                0 /*ClassDecl*/, FieldClassDecl);
       continue;
     }
     

Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=102845&r1=102844&r2=102845&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Sat May  1 11:49:43 2010
@@ -819,8 +819,7 @@
 
   void EmitClassMemberwiseCopy(llvm::Value *DestValue, llvm::Value *SrcValue,
                                const CXXRecordDecl *ClassDecl,
-                               const CXXRecordDecl *BaseClassDecl,
-                               QualType Ty);
+                               const CXXRecordDecl *BaseClassDecl);
 
   void EmitClassCopyAssignment(llvm::Value *DestValue, llvm::Value *SrcValue,
                                const CXXRecordDecl *ClassDecl);