diff options
| -rw-r--r-- | lib/Sema/SemaExprCXX.cpp | 19 | ||||
| -rw-r--r-- | test/CodeGenCXX/PR5050-constructor-conversion.cpp | 6 |
2 files changed, 19 insertions, 6 deletions
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index 76c64f492b..1127970858 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -1113,9 +1113,22 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType, if (SCS.CopyConstructor) { // FIXME: When can ToType be a reference type? assert(!ToType->isReferenceType()); - if (SCS.Second == ICK_Derived_To_Base) - ImpCastExprToType(From, ToType, CastExpr::CK_DerivedToBase, - /*isLvalue=*/true); + if (SCS.Second == ICK_Derived_To_Base) { + ASTOwningVector<&ActionBase::DeleteExpr> ConstructorArgs(*this); + if (CompleteConstructorCall(cast<CXXConstructorDecl>(SCS.CopyConstructor), + MultiExprArg(*this, (void **)&From, 1), + /*FIXME:ConstructLoc*/SourceLocation(), + ConstructorArgs)) + return true; + OwningExprResult FromResult = + BuildCXXConstructExpr(/*FIXME:ConstructLoc*/SourceLocation(), + ToType, SCS.CopyConstructor, + move_arg(ConstructorArgs)); + if (FromResult.isInvalid()) + return true; + From = FromResult.takeAs<Expr>(); + return false; + } OwningExprResult FromResult = BuildCXXConstructExpr(/*FIXME:ConstructLoc*/SourceLocation(), ToType, SCS.CopyConstructor, diff --git a/test/CodeGenCXX/PR5050-constructor-conversion.cpp b/test/CodeGenCXX/PR5050-constructor-conversion.cpp index adfe74ffbc..7c7068742d 100644 --- a/test/CodeGenCXX/PR5050-constructor-conversion.cpp +++ b/test/CodeGenCXX/PR5050-constructor-conversion.cpp @@ -4,7 +4,7 @@ // RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s && // RUN: true -struct A { A(const A&); }; +struct A { A(const A&, int i1 = 1); }; struct B : A { }; @@ -12,8 +12,8 @@ A f(const B &b) { return b; } -// CHECK-LP64: call __ZN1AC1ERK1A +// CHECK-LP64: call __ZN1AC1ERK1Ai -// CHECK-LP32: call L__ZN1AC1ERK1A +// CHECK-LP32: call L__ZN1AC1ERK1Ai |