Index: src/objects-inl.h |
diff --git a/src/objects-inl.h b/src/objects-inl.h |
index 304c6da09fb6aed02a96b7e6af881570955a07d3..57750c3459187f53f3bf43bda562d0bf3baeeaac 100644 |
--- a/src/objects-inl.h |
+++ b/src/objects-inl.h |
@@ -3215,8 +3215,8 @@ int HashTable<Derived, Shape, Key>::FindEntry(Isolate* isolate, Key key, |
Object* element = KeyAt(entry); |
// Empty entry. Uses raw unchecked accessors because it is called by the |
// string table during bootstrapping. |
- if (element == isolate->heap()->raw_unchecked_undefined_value()) break; |
- if (element != isolate->heap()->raw_unchecked_the_hole_value() && |
+ if (element == isolate->heap()->root(Heap::kUndefinedValueRootIndex)) break; |
+ if (element != isolate->heap()->root(Heap::kTheHoleValueRootIndex) && |
Shape::IsMatch(key, element)) return entry; |
entry = NextProbe(entry, count++, capacity); |
} |
@@ -3511,7 +3511,7 @@ int FreeSpace::Size() { return size(); } |
FreeSpace* FreeSpace::next() { |
- DCHECK(map() == GetHeap()->raw_unchecked_free_space_map() || |
+ DCHECK(map() == GetHeap()->root(Heap::kFreeSpaceMapRootIndex) || |
(!GetHeap()->deserialization_complete() && map() == NULL)); |
DCHECK_LE(kNextOffset + kPointerSize, nobarrier_size()); |
return reinterpret_cast<FreeSpace*>( |
@@ -3520,7 +3520,7 @@ FreeSpace* FreeSpace::next() { |
FreeSpace** FreeSpace::next_address() { |
- DCHECK(map() == GetHeap()->raw_unchecked_free_space_map() || |
+ DCHECK(map() == GetHeap()->root(Heap::kFreeSpaceMapRootIndex) || |
(!GetHeap()->deserialization_complete() && map() == NULL)); |
DCHECK_LE(kNextOffset + kPointerSize, nobarrier_size()); |
return reinterpret_cast<FreeSpace**>(address() + kNextOffset); |
@@ -3528,7 +3528,7 @@ FreeSpace** FreeSpace::next_address() { |
void FreeSpace::set_next(FreeSpace* next) { |
- DCHECK(map() == GetHeap()->raw_unchecked_free_space_map() || |
+ DCHECK(map() == GetHeap()->root(Heap::kFreeSpaceMapRootIndex) || |
(!GetHeap()->deserialization_complete() && map() == NULL)); |
DCHECK_LE(kNextOffset + kPointerSize, nobarrier_size()); |
base::NoBarrier_Store( |