summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGClass.cpp
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2010-05-01 16:49:43 +0000
committerAnders Carlsson <andersca@mac.com>2010-05-01 16:49:43 +0000
commit820022c55cc6943c538e4afc045dffc187114e61 (patch)
treefb348c921ec75634b986d513e499c01f1fc5d53b /clang/lib/CodeGen/CGClass.cpp
parent1ebb395ceefd0059911cda55dc0dade876ff068b (diff)
downloadbcm5719-llvm-820022c55cc6943c538e4afc045dffc187114e61.tar.gz
bcm5719-llvm-820022c55cc6943c538e4afc045dffc187114e61.zip
Get rid of a parameter from EmitClassMemberwiseCopy.
llvm-svn: 102845
Diffstat (limited to 'clang/lib/CodeGen/CGClass.cpp')
-rw-r--r--clang/lib/CodeGen/CGClass.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 966a93c6520..856cafe748a 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -594,7 +594,7 @@ static llvm::Value *GetVTTParameter(CodeGenFunction &CGF, GlobalDecl GD) {
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 @@ void CodeGenFunction::EmitClassMemberwiseCopy(
CtorType = Ctor_Base;
}
if (BaseClassDecl->hasTrivialCopyConstructor()) {
- EmitAggregateCopy(Dest, Src, Ty);
+ EmitAggregateCopy(Dest, Src, getContext().getTagDeclType(BaseClassDecl));
return;
}
@@ -718,7 +718,7 @@ CodeGenFunction::SynthesizeCXXCopyConstructor(const FunctionArgList &Args) {
}
else
EmitClassMemberwiseCopy(LHS.getAddress(), RHS.getAddress(),
- 0 /*ClassDecl*/, FieldClassDecl, FieldType);
+ 0 /*ClassDecl*/, FieldClassDecl);
continue;
}
OpenPOWER on IntegriCloud