1 files changed, 14 insertions, 2 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 181d6d1c8f..718d5ab577 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -3182,8 +3182,20 @@ bool Sema::GatherArgumentsForCall(SourceLocation CallLoc,
         return true;
       
       // Pass the argument.
-      if (PerformCopyInitialization(Arg, ProtoArgType, AA_Passing))
-        return true;
+      if (FDecl && i < FDecl->getNumParams()) {
+        ParmVarDecl *Param = FDecl->getParamDecl(i);
+        InitializedEntity Entity =InitializedEntity::InitializeParameter(Param);
+        OwningExprResult ArgE = PerformCopyInitialization(Entity,
+                                                          SourceLocation(),
+                                                          Owned(Arg));
+        if (ArgE.isInvalid())
+          return true;
+
+        Arg = ArgE.takeAs<Expr>();
+      } else {
+        if (PerformCopyInitialization(Arg, ProtoArgType, AA_Passing))
+          return true;
+      }
       
       if (!ProtoArgType->isReferenceType())
         Arg = MaybeBindToTemporary(Arg).takeAs<Expr>();