Reland [heap] Avoid the use of cells to point from code to new-space objects.

src/heap/remembered-set.cc

 // Copyright 2016 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/heap/remembered-set.h"
 #include "src/heap/heap-inl.h"
 #include "src/heap/heap.h"
 #include "src/heap/mark-compact.h"
 #include "src/heap/slot-set.h"
 #include "src/heap/spaces.h"
 #include "src/heap/store-buffer.h"
+#include "src/macro-assembler.h"
 
 namespace v8 {
 namespace internal {
 
 template <PointerDirection direction>
 void RememberedSet<direction>::ClearInvalidSlots(Heap* heap) {
   STATIC_ASSERT(direction == OLD_TO_NEW);
-  for (MemoryChunk* chunk : *heap->old_space()) {
-    SlotSet* slots = GetSlotSet(chunk);
-    if (slots != nullptr) {
-      slots->Iterate([heap, chunk](Address addr) {
-        Object** slot = reinterpret_cast<Object**>(addr);
-        return IsValidSlot(heap, chunk, slot) ? KEEP_SLOT : REMOVE_SLOT;
-      });
+  {
+    for (MemoryChunk* chunk : *heap->old_space()) {
+      {

[Michael Lippautz, 2016/06/23 11:51:12]

nit: I too like building pyramids but there's no need for this additional scopes
;)

[ahaas, 2016/06/23 12:42:21]

done.

+        SlotSet* slots = GetSlotSet(chunk);
+        if (slots != nullptr) {
+          slots->Iterate([heap, chunk](Address addr) {
+            Object** slot = reinterpret_cast<Object**>(addr);
+            return IsValidSlot(heap, chunk, slot) ? KEEP_SLOT : REMOVE_SLOT;
+          });
+        }
+      }
+    }
+  }

[Michael Lippautz, 2016/06/23 11:51:12]

nit: You can also get rid of the outer scopes, so it could be
STATIC_ASSERT
for (...) {
...
}
for (...) {
...
}

[ahaas, 2016/06/23 12:42:21]

done.

+  {
+    for (MemoryChunk* chunk : *heap->code_space()) {
+      TypedSlotSet* slots = GetTypedSlotSet(chunk);
+      if (slots != nullptr) {
+        slots->Iterate(
+            [heap, chunk](SlotType type, Address host_addr, Address addr) {
+              if (Marking::IsBlack(Marking::MarkBitFrom(host_addr))) {
+                return KEEP_SLOT;
+              } else {
+                return REMOVE_SLOT;
+              }
+            });
+      }
     }
   }
 }
 
 template <PointerDirection direction>
 void RememberedSet<direction>::VerifyValidSlots(Heap* heap) {
   Iterate(heap, [heap](Address addr) {
     HeapObject* obj =
         heap->mark_compact_collector()->FindBlackObjectBySlotSlow(addr);
     if (obj == nullptr) {
@@ skipping 29 matching lines @@
          heap->mark_compact_collector()->IsSlotInBlackObject(
              chunk, reinterpret_cast<Address>(slot));
 }
 
 template void RememberedSet<OLD_TO_NEW>::ClearInvalidSlots(Heap* heap);
 template void RememberedSet<OLD_TO_NEW>::VerifyValidSlots(Heap* heap);
 template void RememberedSet<OLD_TO_OLD>::VerifyValidSlots(Heap* heap);
 
 }  // namespace internal
 }  // namespace v8