diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-08-25 05:12:04 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-08-25 05:12:04 +0000 |
| commit | 6eb55575da14af825a2b66ff2c7e452799102e09 (patch) | |
| tree | d318dc5011bddf3038e6d53daa48be01b6ed00ac /clang/lib/Sema/SemaExprCXX.cpp | |
| parent | 355933d0962e86cc496a99e2f719d10544578aff (diff) | |
| download | bcm5719-llvm-6eb55575da14af825a2b66ff2c7e452799102e09.tar.gz bcm5719-llvm-6eb55575da14af825a2b66ff2c7e452799102e09.zip | |
BuildCXXConstructExpr now returns an OwningExprResult.
llvm-svn: 79975
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index d89a0909aa1..aefec6a7a68 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -943,7 +943,13 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType, // FIXME: When can ToType be a reference type? assert(!ToType->isReferenceType()); - From = BuildCXXConstructExpr(ToType, SCS.CopyConstructor, &From, 1); + OwningExprResult FromResult = + BuildCXXConstructExpr(ToType, SCS.CopyConstructor, &From, 1); + + if (FromResult.isInvalid()) + return true; + + From = FromResult.takeAs<Expr>(); return false; } |
