Use Scope::function_kind_ to distinguish arrow function scopes

src/debug/debug-scopes.cc

 // Copyright 2015 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/debug/debug-scopes.h"
 
 #include "src/debug/debug.h"
 #include "src/frames-inl.h"
 #include "src/globals.h"
 #include "src/isolate-inl.h"
@@ skipping 57 matching lines @@
   }
 
   if (ignore_nested_scopes) {
     if (scope_info->HasContext()) {
       context_ = Handle<Context>(context_->declaration_context(), isolate_);
     } else {
       while (context_->closure() == *function) {
         context_ = Handle<Context>(context_->previous(), isolate_);
       }
     }
-    if (scope_info->scope_type() == FUNCTION_SCOPE ||
-        scope_info->scope_type() == ARROW_SCOPE) {
+    if (scope_info->scope_type() == FUNCTION_SCOPE) {
       nested_scope_chain_.Add(scope_info);
     }
   } else {
     // Reparse the code and analyze the scopes.
     Handle<Script> script(Script::cast(shared_info->script()));
     Scope* scope = NULL;
 
     // Check whether we are in global, eval or function code.
     Zone zone;
-    if (scope_info->scope_type() != FUNCTION_SCOPE &&
-        scope_info->scope_type() != ARROW_SCOPE) {
+    if (scope_info->scope_type() != FUNCTION_SCOPE) {
       // Global or eval code.
       ParseInfo info(&zone, script);
       if (scope_info->scope_type() == SCRIPT_SCOPE) {
         info.set_global();
       } else {
         DCHECK(scope_info->scope_type() == EVAL_SCOPE);
         info.set_eval();
         info.set_context(Handle<Context>(function->context()));
       }
       if (Parser::ParseStatic(&info) && Scope::Analyze(&info)) {
@@ skipping 75 matching lines @@
 }
 
 
 // Return the type of the current scope.
 ScopeIterator::ScopeType ScopeIterator::Type() {
   DCHECK(!failed_);
   if (!nested_scope_chain_.is_empty()) {
     Handle<ScopeInfo> scope_info = nested_scope_chain_.last();
     switch (scope_info->scope_type()) {
       case FUNCTION_SCOPE:
-      case ARROW_SCOPE:
         DCHECK(context_->IsFunctionContext() || !scope_info->HasContext());
         return ScopeTypeLocal;
       case MODULE_SCOPE:
         DCHECK(context_->IsModuleContext());
         return ScopeTypeModule;
       case SCRIPT_SCOPE:
         DCHECK(context_->IsScriptContext() || context_->IsNativeContext());
         return ScopeTypeScript;
       case WITH_SCOPE:
         DCHECK(context_->IsWithContext());
@@ skipping 588 matching lines @@
         isolate_, value, Object::GetPropertyOrElement(extension, key), false);
     RETURN_ON_EXCEPTION_VALUE(
         isolate_, JSObject::SetOwnPropertyIgnoreAttributes(
             scope_object, key, value, NONE), false);
   }
   return true;
 }
 
 }  // namespace internal
 }  // namespace v8