[cfe-commits] r91696 - /cfe/trunk/lib/Sema/SemaStmt.cpp

[Douglas Gregor]

Author: dgregor
Date: Fri Dec 18 11:31:58 2009
New Revision: 91696

URL: http://llvm.org/viewvc/llvm-project?rev=91696&view=rev
Log:
Try to de-bork DISABLE_SMART_POINTERS build

Modified:
    cfe/trunk/lib/Sema/SemaStmt.cpp

Modified: cfe/trunk/lib/Sema/SemaStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=91696&r1=91695&r2=91696&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaStmt.cpp (original)
+++ cfe/trunk/lib/Sema/SemaStmt.cpp Fri Dec 18 11:31:58 2009
@@ -1126,17 +1126,17 @@
 
     // In C++ the return statement is handled via a copy initialization.
     // the C version of which boils down to CheckSingleAssignmentConstraints.
-    rex = PerformCopyInitialization(
-                            InitializedEntity::InitializeResult(ReturnLoc, 
-                                                                FnRetTypeLoc),
-                            SourceLocation(),
-                            Owned(RetValExp));
-    if (rex.isInvalid()) {
+    OwningExprResult Res = PerformCopyInitialization(
+                             InitializedEntity::InitializeResult(ReturnLoc, 
+                                                                 FnRetTypeLoc),
+                             SourceLocation(),
+                             Owned(RetValExp));
+    if (Res.isInvalid()) {
       // FIXME: Cleanup temporaries here, anyway?
       return StmtError();
     }
 
-    RetValExp = rex.takeAs<Expr>();
+    RetValExp = Res.takeAs<Expr>();
     if (RetValExp) 
       CheckReturnStackAddr(RetValExp, FnRetType, ReturnLoc);
   }