[heap] Enforce explicit MarkingState

[heap] Enforce explicit MarkingState

Require the use of MarkingState when going through ObjectMarking 
and friends. 

BUG=chromium:651354
Review-Url: https://codereview.chromium.org/2770253002
Cr-Commit-Position: refs/heads/master@{#44123}
Committed: https://chromium.googlesource.com/v8/v8/+/79ac83e121fe60b53e636197c28e345737f5e68a

[Michael Lippautz, 2017-03-24 12:08:56]

Description was changed from

==========
[heap] Enforce explicit MarkingState

BUG=chromium:651354
==========

to

==========
[heap] Enforce explicit MarkingState

BUG=chromium:651354
==========

[Michael Lippautz, 2017-03-24 12:08:56]

mlippautz@chromium.org changed reviewers:
+ hpayer@chromium.org, ulan@chromium.org

[Michael Lippautz, 2017-03-24 12:09:10]

ptal, all mechanical

[Michael Lippautz, 2017-03-24 12:11:52]

Description was changed from

==========
[heap] Enforce explicit MarkingState

BUG=chromium:651354
==========

to

==========
[heap] Enforce explicit MarkingState

Require the use of MarkingState when going through ObjectMarking 
and friends. 

BUG=chromium:651354
==========

[Michael Lippautz, 2017-03-24 12:30:55]

The CQ bit was checked by mlippautz@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-24 12:31:00]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 12:37:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-24 12:37:04]

Dry run: Try jobs failed on following builders:
  v8_linux_dbg_ng on master.tryserver.v8 (JOB_FAILED,
http://build.chromium.org/p/tryserver.v8/builders/v8_linux_dbg_ng/builds/23259)

[Michael Lippautz, 2017-03-24 12:45:44]

The CQ bit was checked by mlippautz@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-24 12:45:55]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 13:11:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-24 13:11:44]

Dry run: This issue passed the CQ dry run.

[ulan, 2017-03-24 13:22:52]

lgtm

[Michael Lippautz, 2017-03-24 14:08:14]

The CQ bit was checked by mlippautz@chromium.org

[Michael Lippautz, 2017-03-24 14:08:14]

The patchset sent to the CQ was uploaded after l-g-t-m from ulan@chromium.org
Link to the patchset: https://codereview.chromium.org/2770253002/#ps40001
(title: "Add couple of TODOs")

[commit-bot: I haz the power, 2017-03-24 14:08:21]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 14:37:38]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-24 14:37:39]

Failed to apply patch for src/heap/mark-compact.cc:
While running git apply --index -p1;
  error: patch failed: src/heap/mark-compact.cc:3572
  error: src/heap/mark-compact.cc: patch does not apply

Patch:       src/heap/mark-compact.cc
Index: src/heap/mark-compact.cc
diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
index
940ad6c283aa43479aef4781192439436066af83..60cb4d370ae1ff85c30dd553afe7c5d79dc6be57
100644
--- a/src/heap/mark-compact.cc
+++ b/src/heap/mark-compact.cc
@@ -104,10 +104,10 @@ void MarkingVerifier::VerifyMarkingOnPage(const Page&
page,
       // The object is either part of a black area of black allocation or a
       // regular black object
       CHECK(
-          state.bitmap->AllBitsSetInRange(
+          state.bitmap()->AllBitsSetInRange(
               page.AddressToMarkbitIndex(current),
               page.AddressToMarkbitIndex(next_object_must_be_here_or_later)) ||
-          state.bitmap->AllBitsClearInRange(
+          state.bitmap()->AllBitsClearInRange(
               page.AddressToMarkbitIndex(current + kPointerSize * 2),
               page.AddressToMarkbitIndex(next_object_must_be_here_or_later)));
       current = next_object_must_be_here_or_later;
@@ -159,11 +159,11 @@ class FullMarkingVerifier : public MarkingVerifier {
 
  protected:
   MarkingState marking_state(MemoryChunk* chunk) override {
-    return MarkingState::FromPageInternal(chunk);
+    return MarkingState::Internal(chunk);
   }
 
   MarkingState marking_state(HeapObject* object) {
-    return marking_state(Page::FromAddress(object->address()));
+    return MarkingState::Internal(object);
   }
 
   void VisitPointers(Object** start, Object** end) override {
@@ -197,11 +197,11 @@ class YoungGenerationMarkingVerifier : public
MarkingVerifier {
   explicit YoungGenerationMarkingVerifier(Heap* heap) : MarkingVerifier(heap)
{}
 
   MarkingState marking_state(MemoryChunk* chunk) override {
-    return MarkingState::FromPageExternal(chunk);
+    return MarkingState::External(chunk);
   }
 
   MarkingState marking_state(HeapObject* object) {
-    return marking_state(Page::FromAddress(object->address()));
+    return MarkingState::External(object);
   }
 
   void Run() override {
@@ -379,16 +379,18 @@ void MarkCompactCollector::CollectGarbage() {
 #ifdef VERIFY_HEAP
 void MarkCompactCollector::VerifyMarkbitsAreClean(PagedSpace* space) {
   for (Page* p : *space) {
-    CHECK(p->markbits()->IsClean());
-    CHECK_EQ(0, p->LiveBytes());
+    const MarkingState state = MarkingState::Internal(p);
+    CHECK(state.bitmap()->IsClean());
+    CHECK_EQ(0, state.live_bytes());
   }
 }
 
 
 void MarkCompactCollector::VerifyMarkbitsAreClean(NewSpace* space) {
   for (Page* p : PageRange(space->bottom(), space->top())) {
-    CHECK(p->markbits()->IsClean());
-    CHECK_EQ(0, p->LiveBytes());
+    const MarkingState state = MarkingState::Internal(p);
+    CHECK(state.bitmap()->IsClean());
+    CHECK_EQ(0, state.live_bytes());
   }
 }
 
@@ -401,8 +403,8 @@ void MarkCompactCollector::VerifyMarkbitsAreClean() {
 
   LargeObjectIterator it(heap_->lo_space());
   for (HeapObject* obj = it.Next(); obj != NULL; obj = it.Next()) {
-    CHECK(ObjectMarking::IsWhite(obj));
-    CHECK_EQ(0, Page::FromAddress(obj->address())->LiveBytes());
+    CHECK(ObjectMarking::IsWhite(obj, MarkingState::Internal(obj)));
+    CHECK_EQ(0, MarkingState::Internal(obj).live_bytes());
   }
 }
 
@@ -430,14 +432,14 @@ void MarkCompactCollector::VerifyOmittedMapChecks() {
 
 static void ClearMarkbitsInPagedSpace(PagedSpace* space) {
   for (Page* p : *space) {
-    p->ClearLiveness();
+    MarkingState::Internal(p).ClearLiveness();
   }
 }
 
 
 static void ClearMarkbitsInNewSpace(NewSpace* space) {
-  for (Page* page : *space) {
-    page->ClearLiveness();
+  for (Page* p : *space) {
+    MarkingState::Internal(p).ClearLiveness();
   }
 }
 
@@ -491,7 +493,10 @@ void MarkCompactCollector::Sweeper::StartSweeping() {
   sweeping_in_progress_ = true;
   ForAllSweepingSpaces([this](AllocationSpace space) {
     std::sort(sweeping_list_[space].begin(), sweeping_list_[space].end(),
-              [](Page* a, Page* b) { return a->LiveBytes() < b->LiveBytes();
});
+              [](Page* a, Page* b) {
+                return MarkingState::Internal(a).live_bytes() <
+                       MarkingState::Internal(b).live_bytes();
+              });
   });
 }
 
@@ -945,7 +950,7 @@ void CodeFlusher::ProcessJSFunctionCandidates() {
     SharedFunctionInfo* shared = candidate->shared();
 
     Code* code = shared->code();
-    if (ObjectMarking::IsWhite(code)) {
+    if (ObjectMarking::IsWhite(code, MarkingState::Internal(code))) {
       if (FLAG_trace_code_flushing && shared->is_compiled()) {
         PrintF("[code-flushing clears: ");
         shared->ShortPrint();
@@ -963,7 +968,7 @@ void CodeFlusher::ProcessJSFunctionCandidates() {
         candidate->set_code(lazy_compile);
       }
     } else {
-      DCHECK(ObjectMarking::IsBlack(code));
+      DCHECK(ObjectMarking::IsBlack(code, MarkingState::Internal(code)));
       candidate->set_code(code);
     }
 
@@ -997,7 +1002,7 @@ void CodeFlusher::ProcessSharedFunctionInfoCandidates() {
     ClearNextCandidate(candidate);
 
     Code* code = candidate->code();
-    if (ObjectMarking::IsWhite(code)) {
+    if (ObjectMarking::IsWhite(code, MarkingState::Internal(code))) {
       if (FLAG_trace_code_flushing && candidate->is_compiled()) {
         PrintF("[code-flushing clears: ");
         candidate->ShortPrint();
@@ -1132,11 +1137,11 @@ class StaticYoungGenerationMarkingVisitor
     StackLimitCheck check(heap->isolate());
     if (check.HasOverflowed()) return false;
 
-    const MarkingState state =
-        MinorMarkCompactCollector::StateForObject(object);
-    if (ObjectMarking::IsBlackOrGrey<MarkBit::NON_ATOMIC>(object, state))
+    if (ObjectMarking::IsBlackOrGrey<MarkBit::NON_ATOMIC>(
+            object, MarkingState::External(object)))
       return true;
-    ObjectMarking::WhiteToBlack<MarkBit::NON_ATOMIC>(object, state);
+    ObjectMarking::WhiteToBlack<MarkBit::NON_ATOMIC>(
+        object, MarkingState::External(object));
     IterateBody(object->map(), object);
     return true;
   }
@@ -1173,8 +1178,8 @@ class MarkCompactMarkingVisitor
   // Marks the object black without pushing it on the marking stack.
   // Returns true if object needed marking and false otherwise.
   INLINE(static bool MarkObjectWithoutPush(Heap* heap, HeapObject* object)) {
-    if (ObjectMarking::IsWhite(object)) {
-      ObjectMarking::WhiteToBlack(object);
+    if (ObjectMarking::IsWhite(object, MarkingState::Internal(object))) {
+      ObjectMarking::WhiteToBlack(object, MarkingState::Internal(object));
       return true;
     }
     return false;
@@ -1195,11 +1200,11 @@ class MarkCompactMarkingVisitor
                                          HeapObject* obj)) {
 #ifdef DEBUG
     DCHECK(collector->heap()->Contains(obj));
-    DCHECK(ObjectMarking::IsWhite(obj));
+    DCHECK(ObjectMarking::IsWhite(obj, MarkingState::Internal(obj)));
 #endif
     Map* map = obj->map();
     Heap* heap = obj->GetHeap();
-    ObjectMarking::WhiteToBlack(obj);
+    ObjectMarking::WhiteToBlack(obj, MarkingState::Internal(obj));
     // Mark the map pointer and the body.
     heap->mark_compact_collector()->MarkObject(map);
     IterateBody(map, obj);
@@ -1220,7 +1225,8 @@ class MarkCompactMarkingVisitor
       if (!o->IsHeapObject()) continue;
       collector->RecordSlot(object, p, o);
       HeapObject* obj = HeapObject::cast(o);
-      if (ObjectMarking::IsBlackOrGrey(obj)) continue;
+      if (ObjectMarking::IsBlackOrGrey(obj, MarkingState::Internal(obj)))
+        continue;
       VisitUnmarkedObject(collector, obj);
     }
     return true;
@@ -1253,7 +1259,7 @@ class MarkCompactMarkingVisitor
       // was marked through the compilation cache before marker reached
JSRegExp
       // object.
       FixedArray* data = FixedArray::cast(re->data());
-      if (ObjectMarking::IsBlackOrGrey(data)) {
+      if (ObjectMarking::IsBlackOrGrey(data, MarkingState::Internal(data))) {
         Object** slot =
             data->data_start() + JSRegExp::saved_code_index(is_one_byte);
         heap->mark_compact_collector()->RecordSlot(data, slot, code);
@@ -1411,12 +1417,12 @@ class MinorMarkCompactCollector::RootMarkingVisitor :
public ObjectVisitor {
     if (!collector_->heap()->InNewSpace(object)) return;
 
     if (ObjectMarking::IsBlackOrGrey<MarkBit::NON_ATOMIC>(
-            object, StateForObject(object)))
+            object, MarkingState::External(object)))
       return;
 
     Map* map = object->map();
-    ObjectMarking::WhiteToBlack<MarkBit::NON_ATOMIC>(object,
-                                                     StateForObject(object));
+    ObjectMarking::WhiteToBlack<MarkBit::NON_ATOMIC>(
+        object, MarkingState::External(object));
     StaticYoungGenerationMarkingVisitor::IterateBody(map, object);
 
     collector_->EmptyMarkingDeque();
@@ -1447,11 +1453,14 @@ class MarkCompactCollector::RootMarkingVisitor : public
ObjectVisitor {
 
     HeapObject* object = HeapObject::cast(*p);
 
-    if (ObjectMarking::IsBlackOrGrey<MarkBit::NON_ATOMIC>(object)) return;
+    if (ObjectMarking::IsBlackOrGrey<MarkBit::NON_ATOMIC>(
+            object, MarkingState::Internal(object)))
+      return;
 
     Map* map = object->map();
     // Mark the object.
-    ObjectMarking::WhiteToBlack<MarkBit::NON_ATOMIC>(object);
+    ObjectMarking::WhiteToBlack<MarkBit::NON_ATOMIC>(
+        object, MarkingState::Internal(object));
 
     // Mark the map pointer and body, and push them on the marking stack.
     collector_->MarkObject(map);
@@ -1481,7 +1490,9 @@ class StringTableCleaner : public ObjectVisitor {
     for (Object** p = start; p < end; p++) {
       Object* o = *p;
       if (o->IsHeapObject()) {
-        if (ObjectMarking::IsWhite(HeapObject::cast(o))) {
+        HeapObject* heap_object = HeapObject::cast(o);
+    …
(message too large)

[Michael Lippautz, 2017-03-24 18:27:22]

The CQ bit was checked by mlippautz@chromium.org

[Michael Lippautz, 2017-03-24 18:27:23]

The patchset sent to the CQ was uploaded after l-g-t-m from ulan@chromium.org
Link to the patchset: https://codereview.chromium.org/2770253002/#ps60001
(title: "rebase")

[commit-bot: I haz the power, 2017-03-24 18:27:34]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 18:54:05]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1490380042992810,
"parent_rev": "c7ec5bf414023242e03a5118c808844164e86542", "commit_rev":
"79ac83e121fe60b53e636197c28e345737f5e68a"}

[commit-bot: I haz the power, 2017-03-24 18:54:09]

Description was changed from

==========
[heap] Enforce explicit MarkingState

Require the use of MarkingState when going through ObjectMarking 
and friends. 

BUG=chromium:651354
==========

to

==========
[heap] Enforce explicit MarkingState

Require the use of MarkingState when going through ObjectMarking 
and friends. 

BUG=chromium:651354

Review-Url: https://codereview.chromium.org/2770253002
Cr-Commit-Position: refs/heads/master@{#44123}
Committed:
https://chromium.googlesource.com/v8/v8/+/79ac83e121fe60b53e636197c28e345737f...
==========

[commit-bot: I haz the power, 2017-03-24 18:54:10]

Committed patchset #4 (id:60001) as
https://chromium.googlesource.com/v8/v8/+/79ac83e121fe60b53e636197c28e345737f...