[heap] Avoid overzealous inclusion of heap internal headers.

This is a first step towards constraining down the heap interface to
just the heap.h file. Note that many includes still leak through that
file to the global "src" directory, but there now is a single place
controlling which declarations leak that way. Especially inclusion of
inline header files within "heap" has been limited drastically.

R=hpayer@chromium.org,mlippautz@chromium.org

Review URL: https://codereview.chromium.org/1281233003

Cr-Commit-Position: refs/heads/master@{#30092}

diff --git a/src/DEPS b/src/DEPS
index 94d6ec6..80dab6b 100644 (file)
--- a/src/DEPS
+++ b/src/DEPS
@@ -2,6 +2,9 @@ include_rules = [
   "+src",
   "-src/compiler",
   "+src/compiler/pipeline.h",
+  "-src/heap",
+  "+src/heap/heap.h",
+  "+src/heap/heap-inl.h",
   "-src/interpreter",
   "+src/interpreter/bytecodes.h",
   "+src/interpreter/interpreter.h",
@@ -13,4 +16,13 @@ specific_include_rules = {
   "d8\.cc": [
     "+include/libplatform/libplatform.h",
   ],
+  # TODO(mstarzinger): Get rid of grab-bag includes from heap in v8.h soon.
+  "v8\.h": [
+    "+src/heap/spaces-inl.h",
+    "+src/heap/incremental-marking-inl.h",
+  ],
+  # TODO(mstarzinger): Only needed because of Code::CodeIterateBody cyclicity.
+  "objects\.cc": [
+    "+src/heap/objects-visiting-inl.h",
+  ],
 }

diff --git a/src/api.cc b/src/api.cc
index 8615d82..107e168 100644 (file)
--- a/src/api.cc
+++ b/src/api.cc
@@ -31,7 +31,6 @@
 #include "src/deoptimizer.h"
 #include "src/execution.h"
 #include "src/global-handles.h"
-#include "src/heap/spaces.h"
 #include "src/heap-profiler.h"
 #include "src/heap-snapshot-generator-inl.h"
 #include "src/icu_util.h"

diff --git a/src/builtins.cc b/src/builtins.cc
index 42ef5ec..6b0b222 100644 (file)
--- a/src/builtins.cc
+++ b/src/builtins.cc
@@ -13,7 +13,6 @@
 #include "src/cpu-profiler.h"
 #include "src/elements.h"
 #include "src/gdb-jit.h"
-#include "src/heap/mark-compact.h"
 #include "src/heap-profiler.h"
 #include "src/ic/handler-compiler.h"
 #include "src/ic/ic.h"

diff --git a/src/frames.cc b/src/frames.cc
index ebe0cb1..c4a93c8 100644 (file)
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -13,7 +13,6 @@
 #include "src/deoptimizer.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
-#include "src/heap/mark-compact.h"
 #include "src/safepoint-table.h"
 #include "src/scopeinfo.h"
 #include "src/string-stream.h"

diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index eb18925..66abc6d 100644 (file)
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -19,6 +19,7 @@
 #include "src/global-handles.h"
 #include "src/heap/gc-idle-time-handler.h"
 #include "src/heap/incremental-marking.h"
+#include "src/heap/mark-compact-inl.h"
 #include "src/heap/mark-compact.h"
 #include "src/heap/memory-reducer.h"
 #include "src/heap/objects-visiting-inl.h"

diff --git a/src/heap/incremental-marking.cc b/src/heap/incremental-marking.cc
index 109f4ea..db19165 100644 (file)
--- a/src/heap/incremental-marking.cc
+++ b/src/heap/incremental-marking.cc
@@ -9,6 +9,7 @@
 #include "src/code-stubs.h"
 #include "src/compilation-cache.h"
 #include "src/conversions.h"
+#include "src/heap/mark-compact-inl.h"
 #include "src/heap/objects-visiting.h"
 #include "src/heap/objects-visiting-inl.h"
 

diff --git a/src/heap/mark-compact-inl.h b/src/heap/mark-compact-inl.h
index c78ae65..0acbe07 100644 (file)
--- a/src/heap/mark-compact-inl.h
+++ b/src/heap/mark-compact-inl.h
@@ -13,12 +13,6 @@ namespace v8 {
 namespace internal {
 
 
-MarkBit Marking::MarkBitFrom(Address addr) {
-  MemoryChunk* p = MemoryChunk::FromAddress(addr);
-  return p->markbits()->MarkBitFromIndex(p->AddressToMarkbitIndex(addr));
-}
-
-
 void MarkCompactCollector::SetFlags(int flags) {
   reduce_memory_footprint_ = ((flags & Heap::kReduceMemoryFootprintMask) != 0);
   abort_incremental_marking_ =

diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
index 8b9a9c3..4de8b0e 100644 (file)
--- a/src/heap/mark-compact.cc
+++ b/src/heap/mark-compact.cc
@@ -15,6 +15,7 @@
 #include "src/global-handles.h"
 #include "src/heap/incremental-marking.h"
 #include "src/heap/mark-compact.h"
+#include "src/heap/mark-compact-inl.h"
 #include "src/heap/objects-visiting.h"
 #include "src/heap/objects-visiting-inl.h"
 #include "src/heap/spaces-inl.h"

diff --git a/src/heap/mark-compact.h b/src/heap/mark-compact.h
index 2610cfb..8db7f45 100644 (file)
--- a/src/heap/mark-compact.h
+++ b/src/heap/mark-compact.h
@@ -28,7 +28,10 @@ class RootMarkingVisitor;
 
 class Marking : public AllStatic {
  public:
-  INLINE(static MarkBit MarkBitFrom(Address addr));
+  INLINE(static MarkBit MarkBitFrom(Address addr)) {
+    MemoryChunk* p = MemoryChunk::FromAddress(addr);
+    return p->markbits()->MarkBitFromIndex(p->AddressToMarkbitIndex(addr));
+  }
 
   INLINE(static MarkBit MarkBitFrom(HeapObject* obj)) {
     return MarkBitFrom(reinterpret_cast<Address>(obj));

diff --git a/src/heap/objects-visiting.cc b/src/heap/objects-visiting.cc
index dc22d0e..1c8e20d 100644 (file)
--- a/src/heap/objects-visiting.cc
+++ b/src/heap/objects-visiting.cc
@@ -4,6 +4,7 @@
 
 #include "src/v8.h"
 
+#include "src/heap/mark-compact-inl.h"
 #include "src/heap/objects-visiting.h"
 
 namespace v8 {

diff --git a/src/isolate.cc b/src/isolate.cc
index f5d6bc9..1a83b70 100644 (file)
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -21,7 +21,6 @@
 #include "src/cpu-profiler.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
-#include "src/heap/spaces.h"
 #include "src/heap-profiler.h"
 #include "src/hydrogen.h"
 #include "src/ic/stub-cache.h"

diff --git a/src/json-parser.h b/src/json-parser.h
index f1fa564..7be799b 100644 (file)
--- a/src/json-parser.h
+++ b/src/json-parser.h
@@ -9,7 +9,6 @@
 
 #include "src/char-predicates-inl.h"
 #include "src/conversions.h"
-#include "src/heap/spaces-inl.h"
 #include "src/messages.h"
 #include "src/token.h"
 

diff --git a/src/messages.cc b/src/messages.cc
index ebec353..55edfa8 100644 (file)
--- a/src/messages.cc
+++ b/src/messages.cc
@@ -6,7 +6,6 @@
 
 #include "src/api.h"
 #include "src/execution.h"
-#include "src/heap/spaces-inl.h"
 #include "src/messages.h"
 #include "src/string-builder.h"
 

diff --git a/src/objects-debug.cc b/src/objects-debug.cc
index da1ed6a..9d90f51 100644 (file)
--- a/src/objects-debug.cc
+++ b/src/objects-debug.cc
@@ -6,7 +6,6 @@
 
 #include "src/disasm.h"
 #include "src/disassembler.h"
-#include "src/heap/objects-visiting.h"
 #include "src/jsregexp.h"
 #include "src/macro-assembler.h"
 #include "src/ostreams.h"

diff --git a/src/objects-inl.h b/src/objects-inl.h
index fd0c602..991253f 100644 (file)
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -20,10 +20,6 @@
 #include "src/field-index-inl.h"
 #include "src/heap/heap-inl.h"
 #include "src/heap/heap.h"
-#include "src/heap/incremental-marking.h"
-#include "src/heap/objects-visiting.h"
-#include "src/heap/spaces.h"
-#include "src/heap/store-buffer.h"
 #include "src/isolate.h"
 #include "src/layout-descriptor-inl.h"
 #include "src/lookup.h"

diff --git a/src/objects-printer.cc b/src/objects-printer.cc
index 3414e21..82648e1 100644 (file)
--- a/src/objects-printer.cc
+++ b/src/objects-printer.cc
@@ -6,7 +6,6 @@
 
 #include "src/disasm.h"
 #include "src/disassembler.h"
-#include "src/heap/objects-visiting.h"
 #include "src/interpreter/bytecodes.h"
 #include "src/jsregexp.h"
 #include "src/ostreams.h"

diff --git a/src/objects.cc b/src/objects.cc
index 3b3eb93..658c0d7 100644 (file)
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -27,7 +27,6 @@
 #include "src/field-index-inl.h"
 #include "src/field-index.h"
 #include "src/full-codegen/full-codegen.h"
-#include "src/heap/mark-compact.h"
 #include "src/heap/objects-visiting-inl.h"
 #include "src/hydrogen.h"
 #include "src/ic/ic.h"

diff --git a/src/runtime-profiler.cc b/src/runtime-profiler.cc
index 1825a7f..865c574 100644 (file)
--- a/src/runtime-profiler.cc
+++ b/src/runtime-profiler.cc
@@ -14,7 +14,6 @@
 #include "src/execution.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/global-handles.h"
-#include "src/heap/mark-compact.h"
 #include "src/scopeinfo.h"
 
 namespace v8 {

diff --git a/src/v8.cc b/src/v8.cc
index d16dbee..bd6f2c2 100644 (file)
--- a/src/v8.cc
+++ b/src/v8.cc
@@ -12,7 +12,6 @@
 #include "src/deoptimizer.h"
 #include "src/elements.h"
 #include "src/frames.h"
-#include "src/heap/store-buffer.h"
 #include "src/heap-profiler.h"
 #include "src/hydrogen.h"
 #include "src/isolate.h"

diff --git a/src/v8.h b/src/v8.h
index 71dd42f..41d4c36 100644 (file)
--- a/src/v8.h
+++ b/src/v8.h
@@ -38,9 +38,7 @@
 // Objects & heap
 #include "src/objects-inl.h"  // NOLINT
 #include "src/heap/spaces-inl.h"               // NOLINT
-#include "src/heap/heap-inl.h"                 // NOLINT
 #include "src/heap/incremental-marking-inl.h"  // NOLINT
-#include "src/heap/mark-compact-inl.h"         // NOLINT
 #include "src/log-inl.h"  // NOLINT
 #include "src/handles-inl.h"  // NOLINT
 #include "src/types-inl.h"  // NOLINT