[objects.h splitting] Move FreeSpace to free-space.h

Bug: v8:5402
Change-Id: I07f276dc6a06a2850aaae0a5ee4cbbfd27d8aa81
Reviewed-on: https://chromium-review.googlesource.com/c/1379875
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Marja Hölttä <marja@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58289}

src/heap/heap.cc

@@ -47,6 +47,7 @@
 #include "src/interpreter/interpreter.h"
 #include "src/microtask-queue.h"
 #include "src/objects/data-handler.h"
+#include "src/objects/free-space-inl.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/maybe-object.h"
 #include "src/objects/shared-function-info.h"

src/heap/objects-visiting-inl.h

@@ -12,6 +12,7 @@
 #include "src/heap/mark-compact.h"
 #include "src/objects-body-descriptors-inl.h"
 #include "src/objects-inl.h"
+#include "src/objects/free-space-inl.h"
 #include "src/objects/js-weak-refs-inl.h"
 #include "src/wasm/wasm-objects.h"
 

src/heap/spaces.cc

@@ -22,6 +22,7 @@
 #include "src/heap/sweeper.h"
 #include "src/msan.h"
 #include "src/objects-inl.h"
+#include "src/objects/free-space-inl.h"
 #include "src/objects/js-array-buffer-inl.h"
 #include "src/objects/js-array-inl.h"
 #include "src/snapshot/snapshot.h"

src/heap/spaces.h

@@ -26,6 +26,7 @@
 #include "src/heap/invalidated-slots.h"
 #include "src/heap/marking.h"
 #include "src/objects.h"
+#include "src/objects/free-space.h"
 #include "src/objects/heap-object.h"
 #include "src/objects/map.h"
 #include "src/utils.h"

src/objects-debug.cc

@@ -24,6 +24,7 @@
 #include "src/objects/embedder-data-slot-inl.h"
 #include "src/objects/feedback-cell-inl.h"
 #include "src/objects/foreign-inl.h"
+#include "src/objects/free-space-inl.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/js-array-inl.h"
 #ifdef V8_INTL_SUPPORT

src/objects-inl.h

@@ -33,6 +33,7 @@
 #include "src/objects/bigint.h"
 #include "src/objects/descriptor-array-inl.h"
 #include "src/objects/embedder-data-array-inl.h"
+#include "src/objects/free-space-inl.h"
 #include "src/objects/js-proxy-inl.h"
 #include "src/objects/literal-objects.h"
 #include "src/objects/maybe-object-inl.h"
@@ -1041,47 +1042,6 @@ DEFINE_DEOPT_ENTRY_ACCESSORS(BytecodeOffsetRaw, Smi)
 DEFINE_DEOPT_ENTRY_ACCESSORS(TranslationIndex, Smi)
 DEFINE_DEOPT_ENTRY_ACCESSORS(Pc, Smi)
 
-SMI_ACCESSORS(FreeSpace, size, kSizeOffset)
-RELAXED_SMI_ACCESSORS(FreeSpace, size, kSizeOffset)
-
-
-int FreeSpace::Size() { return size(); }
-
-
-FreeSpace* FreeSpace::next() {
-#ifdef DEBUG
-  Heap* heap = Heap::FromWritableHeapObject(this);
-  Object* free_space_map = heap->isolate()->root(RootIndex::kFreeSpaceMap);
-  DCHECK_IMPLIES(!map_slot().contains_value(free_space_map->ptr()),
-                 !heap->deserialization_complete() &&
-                     map_slot().contains_value(kNullAddress));
-#endif
-  DCHECK_LE(kNextOffset + kPointerSize, relaxed_read_size());
-  return reinterpret_cast<FreeSpace*>(Memory<Address>(address() + kNextOffset));
-}
-
-
-void FreeSpace::set_next(FreeSpace* next) {
-#ifdef DEBUG
-  Heap* heap = Heap::FromWritableHeapObject(this);
-  Object* free_space_map = heap->isolate()->root(RootIndex::kFreeSpaceMap);
-  DCHECK_IMPLIES(!map_slot().contains_value(free_space_map->ptr()),
-                 !heap->deserialization_complete() &&
-                     map_slot().contains_value(kNullAddress));
-#endif
-  DCHECK_LE(kNextOffset + kPointerSize, relaxed_read_size());
-  base::Relaxed_Store(
-      reinterpret_cast<base::AtomicWord*>(address() + kNextOffset),
-      reinterpret_cast<base::AtomicWord>(next));
-}
-
-
-FreeSpace* FreeSpace::cast(HeapObject* o) {
-  SLOW_DCHECK(!Heap::FromWritableHeapObject(o)->deserialization_complete() ||
-              o->IsFreeSpace());
-  return reinterpret_cast<FreeSpace*>(o);
-}
-
 int HeapObject::SizeFromMap(Map map) const {
   int instance_size = map->instance_size();
   if (instance_size != kVariableSizeSentinel) return instance_size;

src/objects-printer.cc

@@ -20,6 +20,7 @@
 #include "src/objects/embedder-data-slot-inl.h"
 #include "src/objects/feedback-cell-inl.h"
 #include "src/objects/foreign-inl.h"
+#include "src/objects/free-space-inl.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/js-array-buffer-inl.h"
 #include "src/objects/js-array-inl.h"

src/objects.h

@@ -265,6 +265,7 @@ class ElementsAccessor;
 class EnumCache;
 class FixedArrayBase;
 class FixedDoubleArray;
+class FreeSpace;
 class FunctionLiteral;
 class FunctionTemplateInfo;
 class JSAsyncGeneratorObject;
@@ -1325,42 +1326,6 @@ enum class KeyCollectionMode {
       static_cast<int>(v8::KeyCollectionMode::kIncludePrototypes)
 };
 
-// FreeSpace are fixed-size free memory blocks used by the heap and GC.
-// They look like heap objects (are heap object tagged and have a map) so that
-// the heap remains iterable.  They have a size and a next pointer.
-// The next pointer is the raw address of the next FreeSpace object (or NULL)
-// in the free list.
-class FreeSpace: public HeapObject {
- public:
-  // [size]: size of the free space including the header.
-  inline int size() const;
-  inline void set_size(int value);
-
-  inline int relaxed_read_size() const;
-  inline void relaxed_write_size(int value);
-
-  inline int Size();
-
-  // Accessors for the next field.
-  inline FreeSpace* next();
-  inline void set_next(FreeSpace* next);
-
-  inline static FreeSpace* cast(HeapObject* obj);
-
-  // Dispatched behavior.
-  DECL_PRINTER(FreeSpace)
-  DECL_VERIFIER(FreeSpace)
-
-  // Layout description.
-  // Size is smi tagged when it is stored.
-  static const int kSizeOffset = HeapObject::kHeaderSize;
-  static const int kNextOffset = POINTER_SIZE_ALIGN(kSizeOffset + kPointerSize);
-  static const int kSize = kNextOffset + kPointerSize;
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(FreeSpace);
-};
-
 // Utility superclass for stack-allocated objects that must be updated
 // on gc.  It provides two ways for the gc to update instances, either
 // iterating or updating after gc.

src/objects/free-space-inl.h

+// Copyright 2018 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.
+
+#ifndef V8_OBJECTS_FREE_SPACE_INL_H_
+#define V8_OBJECTS_FREE_SPACE_INL_H_
+
+#include "src/objects/free-space.h"
+
+#include "src/heap/heap-inl.h"
+
+// Has to be the last include (doesn't have include guards):
+#include "src/objects/object-macros.h"
+
+namespace v8 {
+namespace internal {
+
+SMI_ACCESSORS(FreeSpace, size, kSizeOffset)
+RELAXED_SMI_ACCESSORS(FreeSpace, size, kSizeOffset)
+
+int FreeSpace::Size() { return size(); }
+
+FreeSpace* FreeSpace::next() {
+#ifdef DEBUG
+  Heap* heap = Heap::FromWritableHeapObject(this);
+  Object* free_space_map = heap->isolate()->root(RootIndex::kFreeSpaceMap);
+  DCHECK_IMPLIES(!map_slot().contains_value(free_space_map->ptr()),
+                 !heap->deserialization_complete() &&
+                     map_slot().contains_value(kNullAddress));
+#endif
+  DCHECK_LE(kNextOffset + kPointerSize, relaxed_read_size());
+  return reinterpret_cast<FreeSpace*>(Memory<Address>(address() + kNextOffset));
+}
+
+void FreeSpace::set_next(FreeSpace* next) {
+#ifdef DEBUG
+  Heap* heap = Heap::FromWritableHeapObject(this);
+  Object* free_space_map = heap->isolate()->root(RootIndex::kFreeSpaceMap);
+  DCHECK_IMPLIES(!map_slot().contains_value(free_space_map->ptr()),
+                 !heap->deserialization_complete() &&
+                     map_slot().contains_value(kNullAddress));
+#endif
+  DCHECK_LE(kNextOffset + kPointerSize, relaxed_read_size());
+  base::Relaxed_Store(
+      reinterpret_cast<base::AtomicWord*>(address() + kNextOffset),
+      reinterpret_cast<base::AtomicWord>(next));
+}
+
+FreeSpace* FreeSpace::cast(HeapObject* o) {
+  SLOW_DCHECK(!Heap::FromWritableHeapObject(o)->deserialization_complete() ||
+              o->IsFreeSpace());
+  return reinterpret_cast<FreeSpace*>(o);
+}
+
+}  // namespace internal
+}  // namespace v8
+
+#include "src/objects/object-macros-undef.h"
+
+#endif  // V8_OBJECTS_FREE_SPACE_INL_H_

src/objects/free-space.h

+// Copyright 2018 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.
+
+#ifndef V8_OBJECTS_FREE_SPACE_H_
+#define V8_OBJECTS_FREE_SPACE_H_
+
+#include "src/objects.h"
+
+// Has to be the last include (doesn't have include guards):
+#include "src/objects/object-macros.h"
+
+namespace v8 {
+namespace internal {
+
+// FreeSpace are fixed-size free memory blocks used by the heap and GC.
+// They look like heap objects (are heap object tagged and have a map) so that
+// the heap remains iterable.  They have a size and a next pointer.
+// The next pointer is the raw address of the next FreeSpace object (or NULL)
+// in the free list.
+class FreeSpace : public HeapObject {
+ public:
+  // [size]: size of the free space including the header.
+  inline int size() const;
+  inline void set_size(int value);
+
+  inline int relaxed_read_size() const;
+  inline void relaxed_write_size(int value);
+
+  inline int Size();
+
+  // Accessors for the next field.
+  inline FreeSpace* next();
+  inline void set_next(FreeSpace* next);
+
+  inline static FreeSpace* cast(HeapObject* obj);
+
+  // Dispatched behavior.
+  DECL_PRINTER(FreeSpace)
+  DECL_VERIFIER(FreeSpace)
+
+  // Layout description.
+  // Size is smi tagged when it is stored.
+  static const int kSizeOffset = HeapObject::kHeaderSize;
+  static const int kNextOffset = POINTER_SIZE_ALIGN(kSizeOffset + kPointerSize);
+  static const int kSize = kNextOffset + kPointerSize;
+
+ private:
+  DISALLOW_IMPLICIT_CONSTRUCTORS(FreeSpace);
+};
+
+}  // namespace internal
+}  // namespace v8
+
+#include "src/objects/object-macros-undef.h"
+
+#endif  // V8_OBJECTS_FREE_SPACE_H_

test/cctest/heap/test-spaces.cc

@@ -32,6 +32,7 @@
 #include "src/heap/factory.h"
 #include "src/heap/spaces-inl.h"
 #include "src/objects-inl.h"
+#include "src/objects/free-space.h"
 #include "src/snapshot/snapshot.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/heap/heap-tester.h"