diff options
| -rw-r--r-- | lib/Sema/SemaExprCXX.cpp | 11 | ||||
| -rw-r--r-- | test/CXX/special/class.copy/p33-0x.cpp | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index 2e5204f258..0b7a051365 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -517,13 +517,14 @@ bool Sema::CheckCXXThrowOperand(SourceLocation ThrowLoc, Expr *&E) { // Initialize the exception result. This implicitly weeds out // abstract types or types with inaccessible copy constructors. + const VarDecl *NRVOVariable = getCopyElisionCandidate(QualType(), E, false); + // FIXME: Determine whether we can elide this copy per C++0x [class.copy]p32. InitializedEntity Entity = - InitializedEntity::InitializeException(ThrowLoc, E->getType(), - /*NRVO=*/false); - ExprResult Res = PerformCopyInitialization(Entity, - SourceLocation(), - Owned(E)); + InitializedEntity::InitializeException(ThrowLoc, E->getType(), + /*NRVO=*/false); + ExprResult Res = PerformMoveOrCopyInitialization(Entity, NRVOVariable, + QualType(), E); if (Res.isInvalid()) return true; E = Res.takeAs<Expr>(); diff --git a/test/CXX/special/class.copy/p33-0x.cpp b/test/CXX/special/class.copy/p33-0x.cpp index a9ce58937a..38eb7adb38 100644 --- a/test/CXX/special/class.copy/p33-0x.cpp +++ b/test/CXX/special/class.copy/p33-0x.cpp @@ -16,4 +16,10 @@ X return_by_move(int i, X x) { else return x; } + +void throw_move_only(X x) { + X x2; + throw x; + throw x2; +} |