Commit 1f967aab authored by Jakob Kummerow's avatar Jakob Kummerow Committed by Commit Bot

Fix noembed configuration

During bootstrapping, both the kFreeSpaceMap root and the map of
actual FreeSpace objects can be nullptr, so the respective DCHECK
must be robust towards this.

Change-Id: Ic7b66b5ab40d7b1bf77c2de936e611e0836cd51f
Reviewed-on: https://chromium-review.googlesource.com/c/1382094Reviewed-by: 's avatarUlan Degenbaev <ulan@chromium.org>
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58314}
parent 8344890b
...@@ -2870,7 +2870,7 @@ void FreeListCategory::Free(Address start, size_t size_in_bytes, ...@@ -2870,7 +2870,7 @@ void FreeListCategory::Free(Address start, size_t size_in_bytes,
void FreeListCategory::RepairFreeList(Heap* heap) { void FreeListCategory::RepairFreeList(Heap* heap) {
FreeSpace n = top(); FreeSpace n = top();
while (!n.is_null()) { while (!n.is_null()) {
ObjectSlot map_location(n->address()); MapWordSlot map_location = n.map_slot();
// We can't use .is_null() here because ObjectSlot.load() returns an // We can't use .is_null() here because ObjectSlot.load() returns an
// ObjectPtr (for which "is null" is not defined, as it would be // ObjectPtr (for which "is null" is not defined, as it would be
// indistinguishable from "is Smi(0)"). Only HeapObjectPtr has "is_null()". // indistinguishable from "is Smi(0)"). Only HeapObjectPtr has "is_null()".
...@@ -3083,7 +3083,9 @@ size_t FreeListCategory::SumFreeList() { ...@@ -3083,7 +3083,9 @@ size_t FreeListCategory::SumFreeList() {
size_t sum = 0; size_t sum = 0;
FreeSpace cur = top(); FreeSpace cur = top();
while (!cur.is_null()) { while (!cur.is_null()) {
DCHECK_EQ(cur->map(), // We can't use "cur->map()" here because both cur's map and the
// root can be null during bootstrapping.
DCHECK_EQ(cur->map_slot().load(),
page()->heap()->isolate()->root(RootIndex::kFreeSpaceMap)); page()->heap()->isolate()->root(RootIndex::kFreeSpaceMap));
sum += cur->relaxed_read_size(); sum += cur->relaxed_read_size();
cur = cur->next(); cur = cur->next();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment