Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Unified Diff: src/objects-inl.h

Issue 1305163007: [heap] Remove raw unchecked root set accessors. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Fix no-snap builds. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/heap/spaces.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « src/heap/spaces.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698