Handle default arguments when calling copy constructors for bases or members when synthesizing a copy constructor. Fixes PR6628.

llvm-svn: 99864

1 files changed, 20 insertions, 0 deletions

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index ebefba24115..8d565f6d417 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -549,10 +549,30 @@ void CodeGenFunction::EmitClassMemberwiseCopy(
     // Push the Src ptr.
     CallArgs.push_back(std::make_pair(RValue::get(Src),
                        BaseCopyCtor->getParamDecl(0)->getType()));
+
+    unsigned OldNumLiveTemporaries = LiveTemporaries.size();
+
+    // If the copy constructor has default arguments, emit them.
+    for (unsigned I = 1, E = BaseCopyCtor->getNumParams(); I < E; ++I) {
+      const ParmVarDecl *Param = BaseCopyCtor->getParamDecl(I);
+      const Expr *DefaultArgExpr = Param->getDefaultArg();
+      
+      assert(DefaultArgExpr && "Ctor parameter must have default arg!");
+
+      QualType ArgType = Param->getType();
+      CallArgs.push_back(std::make_pair(EmitCallArg(DefaultArgExpr, ArgType),
+                                        ArgType));
+
+    }
+
     const FunctionProtoType *FPT =
       BaseCopyCtor->getType()->getAs<FunctionProtoType>();
     EmitCall(CGM.getTypes().getFunctionInfo(CallArgs, FPT),
              Callee, ReturnValueSlot(), CallArgs, BaseCopyCtor);
+    
+    // Pop temporaries.
+    while (LiveTemporaries.size() > OldNumLiveTemporaries)
+      PopCXXTemporary();
   }
 }