Kick out the proof-of-concept ASTOwner and replace it with ASTOwningResult

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

1 files changed, 3 insertions, 4 deletions

diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 3a3b9d88dc..b4c12fa2ad 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -17,7 +17,6 @@
 #include "clang/Parse/Scope.h"
 #include "ExtensionRAIIObject.h"
 #include "ParsePragma.h"
-#include "AstGuard.h"
 using namespace clang;
 
 Parser::Parser(Preprocessor &pp, Action &actions)
@@ -337,7 +336,7 @@ Parser::DeclTy *Parser::ParseExternalDeclaration() {
     return ParseExternalDeclaration();
   }
   case tok::kw_asm: {
-    ExprOwner Result(Actions, ParseSimpleAsm());
+    OwningExprResult Result(Actions, ParseSimpleAsm());
 
     ExpectAndConsume(tok::semi, diag::err_expected_semi_after,
                      "top-level asm block");
@@ -673,7 +672,7 @@ Parser::ExprResult Parser::ParseAsmStringLiteral() {
     return true;
   }
 
-  ExprOwner Res(Actions, ParseStringLiteralExpression());
+  OwningExprResult Res(Actions, ParseStringLiteralExpression());
   if (Res.isInvalid()) return true;
 
   // TODO: Diagnose: wide string literal in 'asm'
@@ -697,7 +696,7 @@ Parser::ExprResult Parser::ParseSimpleAsm() {
 
   ConsumeParen();
 
-  ExprOwner Result(Actions, ParseAsmStringLiteral());
+  OwningExprResult Result(Actions, ParseAsmStringLiteral());
 
   if (Result.isInvalid())
     SkipUntil(tok::r_paren);