[parser] Various Scope and Context speedups

- Dehandlify ScopeInfo::ContextSlotIndex
- Dehandlify ScriptContextTable::Lookup
- Introduce function-kind.h with range-based helper methods
- Spread usage of Scope::is_script_scope and friends

Change-Id: I8ed1d82cc5bb9ea3fce856e16e9eafe194fb57ba
Reviewed-on: https://chromium-review.googlesource.com/c/1430100
Reviewed-by: Leszek Swirski <[email protected]>
Reviewed-by: Jaroslav Sevcik <[email protected]>
Reviewed-by: Ulan Degenbaev <[email protected]>
Reviewed-by: Maya Lekova <[email protected]>
Reviewed-by: Toon Verwaest <[email protected]>
Commit-Queue: Camillo Bruni <[email protected]>
Cr-Commit-Position: refs/heads/master@{#59120}

Author: camillobruni

BUILD.gn

@@ -1962,6 +1962,7 @@ v8_source_set("v8_base") {
     "src/frames-inl.h",
     "src/frames.cc",
     "src/frames.h",
+    "src/function-kind.h",
     "src/futex-emulation.cc",
     "src/futex-emulation.h",
     "src/gdb-jit.cc",

src/ast/prettyprinter.h

@@ -8,6 +8,7 @@
 #include "src/allocation.h"
 #include "src/ast/ast.h"
 #include "src/base/compiler-specific.h"
+#include "src/function-kind.h"
 
 namespace v8 {
 namespace internal {

src/ast/scopes.cc

@@ -547,8 +547,7 @@ bool DeclarationScope::Analyze(ParseInfo* info) {
   // 1) top-level code,
   // 2) a function/eval/module on the top-level
   // 3) a function/eval in a scope that was already resolved.
-  DCHECK(scope->scope_type() == SCRIPT_SCOPE ||
-         scope->outer_scope()->scope_type() == SCRIPT_SCOPE ||
+  DCHECK(scope->is_script_scope() || scope->outer_scope()->is_script_scope() ||
          scope->outer_scope()->already_resolved_);
 
   // The outer scope is never lazy.
@@ -786,8 +785,9 @@ void Scope::ReplaceOuterScope(Scope* outer) {
 Variable* Scope::LookupInScopeInfo(const AstRawString* name, Scope* cache) {
   DCHECK(!scope_info_.is_null());
   DCHECK_NULL(cache->variables_.Lookup(name));
+  DisallowHeapAllocation no_gc;
 
-  Handle<String> name_handle = name->string();
+  String name_handle = *name->string();
   // The Scope is backed up by ScopeInfo. This means it cannot operate in a
   // heap-independent mode, and all strings must be internalized immediately. So
   // it's ok to get the Handle<String> here.
@@ -801,20 +801,20 @@ Variable* Scope::LookupInScopeInfo(const AstRawString* name, Scope* cache) {
 
   {
     location = VariableLocation::CONTEXT;
-    index = ScopeInfo::ContextSlotIndex(scope_info_, name_handle, &mode,
+    index = ScopeInfo::ContextSlotIndex(*scope_info_, name_handle, &mode,
                                         &init_flag, &maybe_assigned_flag);
     found = index >= 0;
   }
 
-  if (!found && scope_type() == MODULE_SCOPE) {
+  if (!found && is_module_scope()) {
     location = VariableLocation::MODULE;
     index = scope_info_->ModuleIndex(name_handle, &mode, &init_flag,
                                      &maybe_assigned_flag);
     found = index != 0;
   }
 
   if (!found) {
-    index = scope_info_->FunctionContextSlotIndex(*name_handle);
+    index = scope_info_->FunctionContextSlotIndex(name_handle);
     if (index < 0) return nullptr;  // Nowhere found.
     Variable* var = AsDeclarationScope()->DeclareFunctionVar(name, cache);
     DCHECK_EQ(VariableMode::kConst, var->mode());

src/ast/scopes.h

@@ -8,6 +8,7 @@
 #include "src/ast/ast.h"
 #include "src/base/compiler-specific.h"
 #include "src/base/hashmap.h"
+#include "src/function-kind.h"
 #include "src/globals.h"
 #include "src/objects.h"
 #include "src/pointer-with-payload.h"

src/bootstrapper.cc

@@ -17,6 +17,7 @@
 #include "src/extensions/ignition-statistics-extension.h"
 #include "src/extensions/statistics-extension.h"
 #include "src/extensions/trigger-failure-extension.h"
+#include "src/function-kind.h"
 #include "src/heap/heap.h"
 #include "src/isolate-inl.h"
 #include "src/math-random.h"

src/code-stub-assembler.cc

@@ -8,6 +8,7 @@
 #include "src/counters.h"
 #include "src/frames-inl.h"
 #include "src/frames.h"
+#include "src/function-kind.h"
 #include "src/objects/api-callbacks.h"
 #include "src/objects/cell.h"
 #include "src/objects/descriptor-array.h"

src/compiler/js-heap-broker.cc

@@ -1924,8 +1924,8 @@ ScriptContextTableRef::lookup(const NameRef& name) const {
   if (!name.IsString()) return {};
   ScriptContextTable::LookupResult lookup_result;
   auto table = object();
-  if (!ScriptContextTable::Lookup(broker()->isolate(), table,
-                                  name.AsString().object(), &lookup_result)) {
+  if (!ScriptContextTable::Lookup(broker()->isolate(), *table,
+                                  *name.AsString().object(), &lookup_result)) {
     return {};
   }
   Handle<Context> script_context = ScriptContextTable::GetContext(

src/compiler/js-heap-broker.h

@@ -8,6 +8,7 @@
 #include "src/base/compiler-specific.h"
 #include "src/base/optional.h"
 #include "src/compiler/refs-map.h"
+#include "src/function-kind.h"
 #include "src/globals.h"
 #include "src/handles.h"
 #include "src/objects.h"

src/contexts-inl.h

@@ -35,9 +35,12 @@ void ScriptContextTable::set_used(int used) {
 Handle<Context> ScriptContextTable::GetContext(Isolate* isolate,
                                                Handle<ScriptContextTable> table,
                                                int i) {
-  DCHECK(i < table->used());
-  return Handle<Context>::cast(
-      FixedArray::get(*table, i + kFirstContextSlotIndex, isolate));
+  return handle(table->get_context(i), isolate);
+}
+
+Context ScriptContextTable::get_context(int i) const {
+  DCHECK_LT(i, used());
+  return Context::cast(this->get(i + kFirstContextSlotIndex));
 }
 
 OBJECT_CONSTRUCTORS_IMPL(Context, HeapObject)
@@ -193,8 +196,7 @@ int Context::FunctionMapIndex(LanguageMode language_mode, FunctionKind kind,
 
     base = ASYNC_FUNCTION_MAP_INDEX;
 
-  } else if (IsArrowFunction(kind) || IsConciseMethod(kind) ||
-             IsAccessorFunction(kind)) {
+  } else if (IsStrictFunctionWithoutPrototype(kind)) {
     DCHECK_IMPLIES(IsArrowFunction(kind), !needs_home_object);
     CHECK_FOLLOWS4(STRICT_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX,
                    METHOD_WITH_NAME_MAP_INDEX,

src/contexts.cc

@@ -37,15 +37,14 @@ Handle<ScriptContextTable> ScriptContextTable::Extend(
   return result;
 }
 
-bool ScriptContextTable::Lookup(Isolate* isolate,
-                                Handle<ScriptContextTable> table,
-                                Handle<String> name, LookupResult* result) {
+bool ScriptContextTable::Lookup(Isolate* isolate, ScriptContextTable table,
+                                String name, LookupResult* result) {
+  DisallowHeapAllocation no_gc;
   for (int i = 0; i < table->used(); i++) {
-    Handle<Context> context = GetContext(isolate, table, i);
+    Context context = table->get_context(i);
     DCHECK(context->IsScriptContext());
-    Handle<ScopeInfo> scope_info(context->scope_info(), context->GetIsolate());
     int slot_index = ScopeInfo::ContextSlotIndex(
-        scope_info, name, &result->mode, &result->init_flag,
+        context->scope_info(), name, &result->mode, &result->init_flag,
         &result->maybe_assigned_flag);
 
     if (slot_index >= 0) {
@@ -57,7 +56,6 @@ bool ScriptContextTable::Lookup(Isolate* isolate,
   return false;
 }
 
-
 bool Context::is_declaration_context() {
   if (IsFunctionContext() || IsNativeContext() || IsScriptContext() ||
       IsModuleContext()) {
@@ -211,27 +209,25 @@ Handle<Object> Context::Lookup(Handle<Context> context, Handle<String> name,
       Handle<JSReceiver> object(context->extension_receiver(), isolate);
 
       if (context->IsNativeContext()) {
+        DisallowHeapAllocation no_gc;
         if (FLAG_trace_contexts) {
           PrintF(" - trying other script contexts\n");
         }
         // Try other script contexts.
-        Handle<ScriptContextTable> script_contexts(
-            context->global_object()->native_context()->script_context_table(),
-            isolate);
+        ScriptContextTable script_contexts =
+            context->global_object()->native_context()->script_context_table();
         ScriptContextTable::LookupResult r;
-        if (ScriptContextTable::Lookup(isolate, script_contexts, name, &r)) {
+        if (ScriptContextTable::Lookup(isolate, script_contexts, *name, &r)) {
+          Context context = script_contexts->get_context(r.context_index);
           if (FLAG_trace_contexts) {
-            Handle<Context> c = ScriptContextTable::GetContext(
-                isolate, script_contexts, r.context_index);
             PrintF("=> found property in script context %d: %p\n",
-                   r.context_index, reinterpret_cast<void*>(c->ptr()));
+                   r.context_index, reinterpret_cast<void*>(context->ptr()));
           }
           *index = r.slot_index;
           *variable_mode = r.mode;
           *init_flag = r.init_flag;
           *attributes = GetAttributesForMode(r.mode);
-          return ScriptContextTable::GetContext(isolate, script_contexts,
-                                                r.context_index);
+          return handle(context, isolate);
         }
       }
 
@@ -285,13 +281,14 @@ Handle<Object> Context::Lookup(Handle<Context> context, Handle<String> name,
     if (context->IsFunctionContext() || context->IsBlockContext() ||
         context->IsScriptContext() || context->IsEvalContext() ||
         context->IsModuleContext() || context->IsCatchContext()) {
+      DisallowHeapAllocation no_gc;
       // Use serialized scope information of functions and blocks to search
       // for the context index.
-      Handle<ScopeInfo> scope_info(context->scope_info(), isolate);
+      ScopeInfo scope_info = context->scope_info();
       VariableMode mode;
       InitializationFlag flag;
       MaybeAssignedFlag maybe_assigned_flag;
-      int slot_index = ScopeInfo::ContextSlotIndex(scope_info, name, &mode,
+      int slot_index = ScopeInfo::ContextSlotIndex(scope_info, *name, &mode,
                                                    &flag, &maybe_assigned_flag);
       DCHECK(slot_index < 0 || slot_index >= MIN_CONTEXT_SLOTS);
       if (slot_index >= 0) {
@@ -334,7 +331,7 @@ Handle<Object> Context::Lookup(Handle<Context> context, Handle<String> name,
         InitializationFlag flag;
         MaybeAssignedFlag maybe_assigned_flag;
         int cell_index =
-            scope_info->ModuleIndex(name, &mode, &flag, &maybe_assigned_flag);
+            scope_info->ModuleIndex(*name, &mode, &flag, &maybe_assigned_flag);
         if (cell_index != 0) {
           if (FLAG_trace_contexts) {
             PrintF("=> found in module imports or exports\n");