Slight cleanup of TryCatch parsing/variable declaration

src/parsing/parser.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/parsing/parser.h"
 
 #include "src/api.h"
 #include "src/ast/ast.h"
 #include "src/ast/ast-expression-rewriter.h"
 #include "src/ast/ast-expression-visitor.h"
@@ skipping 2977 matching lines @@
       catch_block = factory()->NewBlock(nullptr, 16, false, kNoSourcePosition);
 
       // Create a block scope to hold any lexical declarations created
       // as part of destructuring the catch parameter.
       Scope* block_scope = NewScope(scope_, BLOCK_SCOPE);
       block_scope->set_start_position(scanner()->location().beg_pos);
       {
         BlockState block_state(&scope_, block_scope);
         Target target(&this->target_stack_, catch_block);
 
-        ExpressionClassifier pattern_classifier(this);
-        Expression* pattern =
-            ParsePrimaryExpression(&pattern_classifier, CHECK_OK);
-        ValidateBindingPattern(&pattern_classifier, CHECK_OK);
-
         const AstRawString* name = ast_value_factory()->dot_catch_string();
-        bool is_simple = pattern->IsVariableProxy();
-        if (is_simple) {
-          auto proxy = pattern->AsVariableProxy();
-          scope_->RemoveUnresolved(proxy);
-          name = proxy->raw_name();
+        Expression* pattern = nullptr;
+        if (peek_any_identifier()) {
+          name = ParseIdentifier(kDontAllowRestrictedIdentifiers, CHECK_OK);
+        } else {
+          ExpressionClassifier pattern_classifier(this);
+          pattern = ParsePrimaryExpression(&pattern_classifier, CHECK_OK);
+          ValidateBindingPattern(&pattern_classifier, CHECK_OK);
         }
         catch_variable = catch_scope->DeclareLocal(
             name, VAR, kCreatedInitialized, Variable::NORMAL);
 
         Expect(Token::RPAREN, CHECK_OK);
 
         ZoneList<const AstRawString*> bound_names(1, zone());
-
-        if (!is_simple) {
+        if (pattern != nullptr) {
           DeclarationDescriptor descriptor;
           descriptor.declaration_kind = DeclarationDescriptor::NORMAL;
           descriptor.parser = this;
           descriptor.scope = scope_;
           descriptor.hoist_scope = nullptr;
           descriptor.mode = LET;
           descriptor.declaration_pos = pattern->position();
           descriptor.initialization_pos = pattern->position();
 
           // Initializer position for variables declared by the pattern.
@@ skipping 4022 matching lines @@
 
 #ifdef DEBUG
 void Parser::Print(AstNode* node) {
   ast_value_factory()->Internalize(Isolate::Current());
   node->Print(Isolate::Current());
 }
 #endif  // DEBUG
 
 }  // namespace internal
 }  // namespace v8