Consistently use smart pointers for stmt and expr nodes in parser local variables.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp
index 5801f9ecb7..b20799150c 100644
--- a/lib/Parse/ParseTemplate.cpp
+++ b/lib/Parse/ParseTemplate.cpp
@@ -15,6 +15,7 @@
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Parse/DeclSpec.h"
 #include "clang/Parse/Scope.h"
+#include "AstGuard.h"
 
 using namespace clang;
 
@@ -231,11 +232,11 @@ Parser::DeclTy* Parser::ParseTemplateTemplateParameter() {
   }
 
   // Get the a default value, if given.
-  ExprResult defaultExpr;
+  ExprOwner DefaultExpr(Actions);
   if(Tok.is(tok::equal)) {
     ConsumeToken();
-    defaultExpr = ParseCXXIdExpression();
-    if(defaultExpr.isInvalid) {
+    DefaultExpr = ParseCXXIdExpression();
+    if(DefaultExpr.isInvalid()) {
       return 0;
     }
   }