diff options
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/SemaExprCXX.cpp | 6 | ||||
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index 7e0422e432..5b74938191 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -911,8 +911,10 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType, assert(!ToType->isReferenceType()); // FIXME: Keep track of whether the copy constructor is elidable or not. - From = BuildCXXConstructExpr(Context, - ToType, SCS.CopyConstructor, false, &From, 1); + bool Elidable = (isa<CallExpr>(From) || + isa<CXXTemporaryObjectExpr>(From)); + From = BuildCXXConstructExpr(Context, ToType, + SCS.CopyConstructor, Elidable, &From, 1); return false; } diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 445cd691d6..29113822f7 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -176,9 +176,10 @@ bool Sema::CheckInitializerTypes(Expr *&Init, QualType &DeclType, DirectInit? IK_Direct : IK_Copy); if (!Constructor) return true; - + bool Elidable = (isa<CallExpr>(Init) || + isa<CXXTemporaryObjectExpr>(Init)); Init = BuildCXXConstructExpr(Context, - DeclType, Constructor, false, &Init, 1); + DeclType, Constructor, Elidable, &Init, 1); Init = MaybeCreateCXXExprWithTemporaries(Init, /*DestroyTemps=*/true); return false; } |