commit da3f4e2dd5938145f132be237a2ed5914cc86702
author Anders Carlsson <andersca@mac.com> Tue Aug 25 05:12:04 2009 +0000
committer Anders Carlsson <andersca@mac.com> Tue Aug 25 05:12:04 2009 +0000
tree 16759559dd34c5ce8c0fcf22cad9b058f3103793
parent 56c5e33460cb6672590075818bcc555aacb3f6bb

BuildCXXConstructExpr now returns an OwningExprResult.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@79975 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaExprCXX.cpp

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index d89a090..aefec6a 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -943,7 +943,13 @@
     // 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;
   }