[literals] Move DeprecationUpdateContext to runtime-literals.cc

Change-Id: I918bf4752c66537015cc67bd81ec68a57b4dac52
Reviewed-on: https://chromium-review.googlesource.com/544878Reviewed-by: Toon Verwaest <verwaest@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46130}

BUILD.gn

@@ -1101,7 +1101,6 @@ v8_source_set("v8_base") {
     "src/accessors.h",
     "src/address-map.cc",
     "src/address-map.h",
-    "src/allocation-site-scopes.cc",
     "src/allocation-site-scopes.h",
     "src/allocation.cc",
     "src/allocation.h",

src/allocation-site-scopes.cc

-// Copyright 2013 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/allocation-site-scopes.h"
-#include "src/factory.h"
-#include "src/isolate.h"
-#include "src/objects-inl.h"
-
-namespace v8 {
-namespace internal {
-
-
-Handle<AllocationSite> AllocationSiteCreationContext::EnterNewScope() {
-  Handle<AllocationSite> scope_site;
-  if (top().is_null()) {
-    // We are creating the top level AllocationSite as opposed to a nested
-    // AllocationSite.
-    InitializeTraversal(isolate()->factory()->NewAllocationSite());
-    scope_site = Handle<AllocationSite>(*top(), isolate());
-    if (FLAG_trace_creation_allocation_sites) {
-      PrintF("*** Creating top level AllocationSite %p\n",
-             static_cast<void*>(*scope_site));
-    }
-  } else {
-    DCHECK(!current().is_null());
-    scope_site = isolate()->factory()->NewAllocationSite();
-    if (FLAG_trace_creation_allocation_sites) {
-      PrintF("Creating nested site (top, current, new) (%p, %p, %p)\n",
-             static_cast<void*>(*top()),
-             static_cast<void*>(*current()),
-             static_cast<void*>(*scope_site));
-    }
-    current()->set_nested_site(*scope_site);
-    update_current_site(*scope_site);
-  }
-  DCHECK(!scope_site.is_null());
-  return scope_site;
-}
-
-
-void AllocationSiteCreationContext::ExitScope(
-    Handle<AllocationSite> scope_site,
-    Handle<JSObject> object) {
-  if (object.is_null()) return;
-  scope_site->set_transition_info(*object);
-  if (FLAG_trace_creation_allocation_sites) {
-    bool top_level = !scope_site.is_null() && top().is_identical_to(scope_site);
-    if (top_level) {
-      PrintF("*** Setting AllocationSite %p transition_info %p\n",
-             static_cast<void*>(*scope_site), static_cast<void*>(*object));
-    } else {
-      PrintF("Setting AllocationSite (%p, %p) transition_info %p\n",
-             static_cast<void*>(*top()), static_cast<void*>(*scope_site),
-             static_cast<void*>(*object));
-    }
-  }
-}
-
-
-bool AllocationSiteUsageContext::ShouldCreateMemento(Handle<JSObject> object) {
-  if (activated_ && AllocationSite::CanTrack(object->map()->instance_type())) {
-    if (FLAG_allocation_site_pretenuring ||
-        AllocationSite::ShouldTrack(object->GetElementsKind())) {
-      if (FLAG_trace_creation_allocation_sites) {
-        PrintF("*** Creating Memento for %s %p\n",
-               object->IsJSArray() ? "JSArray" : "JSObject",
-               static_cast<void*>(*object));
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-}  // namespace internal
-}  // namespace v8

src/allocation-site-scopes.h

@@ -7,29 +7,11 @@
 
 #include "src/handles.h"
 #include "src/objects.h"
+#include "src/objects/map.h"
 
 namespace v8 {
 namespace internal {
 
-class DeprecationUpdateContext {
- public:
-  explicit DeprecationUpdateContext(Isolate* isolate) { isolate_ = isolate; }
-  Isolate* isolate() { return isolate_; }
-  bool ShouldCreateMemento(Handle<JSObject> object) { return false; }
-  inline void ExitScope(Handle<AllocationSite> scope_site,
-                        Handle<JSObject> object) {}
-  Handle<AllocationSite> EnterNewScope() { return Handle<AllocationSite>(); }
-  Handle<AllocationSite> current() {
-    UNREACHABLE();
-    return Handle<AllocationSite>();
-  }
-
-  static const bool kCopying = false;
-
- private:
-  Isolate* isolate_;
-};
-
 // AllocationSiteContext is the base class for walking and copying a nested
 // boilerplate with AllocationSite and AllocationMemento support.
 class AllocationSiteContext {
@@ -62,19 +44,6 @@ class AllocationSiteContext {
 };
 
 
-// AllocationSiteCreationContext aids in the creation of AllocationSites to
-// accompany object literals.
-class AllocationSiteCreationContext : public AllocationSiteContext {
- public:
-  explicit AllocationSiteCreationContext(Isolate* isolate)
-      : AllocationSiteContext(isolate) { }
-
-  Handle<AllocationSite> EnterNewScope();
-  void ExitScope(Handle<AllocationSite> site, Handle<JSObject> object);
-  static const bool kCopying = false;
-};
-
-
 // AllocationSiteUsageContext aids in the creation of AllocationMementos placed
 // behind some/all components of a copied object literal.
 class AllocationSiteUsageContext : public AllocationSiteContext {
@@ -104,7 +73,22 @@ class AllocationSiteUsageContext : public AllocationSiteContext {
     DCHECK(object.is_null() || *object == scope_site->transition_info());
   }
 
-  bool ShouldCreateMemento(Handle<JSObject> object);
+  bool ShouldCreateMemento(Handle<JSObject> object) {
+    if (activated_ &&
+        AllocationSite::CanTrack(object->map()->instance_type())) {
+      if (FLAG_allocation_site_pretenuring ||
+          AllocationSite::ShouldTrack(object->GetElementsKind())) {
+        if (FLAG_trace_creation_allocation_sites) {
+          PrintF("*** Creating Memento for %s %p\n",
+                 object->IsJSArray() ? "JSArray" : "JSObject",
+                 static_cast<void*>(*object));
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+
   static const bool kCopying = true;
 
  private:

src/objects.h

@@ -930,11 +930,8 @@ enum class ComparisonResult {
 class AbstractCode;
 class AccessorPair;
 class AllocationSite;
-class AllocationSiteCreationContext;
-class AllocationSiteUsageContext;
 class Cell;
 class ConsString;
-class DeprecationUpdateContext;
 class ElementsAccessor;
 class FindAndReplacePattern;
 class FixedArrayBase;

src/runtime/runtime-literals.cc

@@ -207,6 +207,76 @@ MaybeHandle<JSObject> JSObjectWalkVisitor<ContextObject>::StructureWalk(
   return copy;
 }
 
+class DeprecationUpdateContext {
+ public:
+  explicit DeprecationUpdateContext(Isolate* isolate) { isolate_ = isolate; }
+  Isolate* isolate() { return isolate_; }
+  bool ShouldCreateMemento(Handle<JSObject> object) { return false; }
+  inline void ExitScope(Handle<AllocationSite> scope_site,
+                        Handle<JSObject> object) {}
+  Handle<AllocationSite> EnterNewScope() { return Handle<AllocationSite>(); }
+  Handle<AllocationSite> current() {
+    UNREACHABLE();
+    return Handle<AllocationSite>();
+  }
+
+  static const bool kCopying = false;
+
+ private:
+  Isolate* isolate_;
+};
+
+// AllocationSiteCreationContext aids in the creation of AllocationSites to
+// accompany object literals.
+class AllocationSiteCreationContext : public AllocationSiteContext {
+ public:
+  explicit AllocationSiteCreationContext(Isolate* isolate)
+      : AllocationSiteContext(isolate) {}
+
+  Handle<AllocationSite> EnterNewScope() {
+    Handle<AllocationSite> scope_site;
+    if (top().is_null()) {
+      // We are creating the top level AllocationSite as opposed to a nested
+      // AllocationSite.
+      InitializeTraversal(isolate()->factory()->NewAllocationSite());
+      scope_site = Handle<AllocationSite>(*top(), isolate());
+      if (FLAG_trace_creation_allocation_sites) {
+        PrintF("*** Creating top level AllocationSite %p\n",
+               static_cast<void*>(*scope_site));
+      }
+    } else {
+      DCHECK(!current().is_null());
+      scope_site = isolate()->factory()->NewAllocationSite();
+      if (FLAG_trace_creation_allocation_sites) {
+        PrintF("Creating nested site (top, current, new) (%p, %p, %p)\n",
+               static_cast<void*>(*top()), static_cast<void*>(*current()),
+               static_cast<void*>(*scope_site));
+      }
+      current()->set_nested_site(*scope_site);
+      update_current_site(*scope_site);
+    }
+    DCHECK(!scope_site.is_null());
+    return scope_site;
+  }
+  void ExitScope(Handle<AllocationSite> scope_site, Handle<JSObject> object) {
+    if (object.is_null()) return;
+    scope_site->set_transition_info(*object);
+    if (FLAG_trace_creation_allocation_sites) {
+      bool top_level =
+          !scope_site.is_null() && top().is_identical_to(scope_site);
+      if (top_level) {
+        PrintF("*** Setting AllocationSite %p transition_info %p\n",
+               static_cast<void*>(*scope_site), static_cast<void*>(*object));
+      } else {
+        PrintF("Setting AllocationSite (%p, %p) transition_info %p\n",
+               static_cast<void*>(*top()), static_cast<void*>(*scope_site),
+               static_cast<void*>(*object));
+      }
+    }
+  }
+  static const bool kCopying = false;
+};
+
 MaybeHandle<JSObject> DeepWalk(Handle<JSObject> object,
                                DeprecationUpdateContext* site_context) {
   JSObjectWalkVisitor<DeprecationUpdateContext> v(site_context, kNoHints);

src/v8.gyp

@@ -560,7 +560,6 @@
         'address-map.h',
         'allocation.cc',
         'allocation.h',
-        'allocation-site-scopes.cc',
         'allocation-site-scopes.h',
         'api.cc',
         'api.h',