Bug 1289581 - Follow-up to fix non-unified bustage; r=meow
authorTerrence Cole <terrence@mozilla.com>
Fri, 05 Aug 2016 14:44:32 -0700
changeset 308425 104899f933cb87f49cb7a5e0deb0d4bb952c7700
parent 308424 d8a125a7dc496d5366d4065cc58938da5145d41c
child 308426 aef42c5d23290400e0ba59afc8c95f43fd2b1b8a
push id80336
push usertcole@mozilla.com
push dateFri, 05 Aug 2016 21:45:12 +0000
treeherdermozilla-inbound@104899f933cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmeow
bugs1289581
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1289581 - Follow-up to fix non-unified bustage; r=meow
js/src/gc/Barrier.cpp
--- a/js/src/gc/Barrier.cpp
+++ b/js/src/gc/Barrier.cpp
@@ -25,18 +25,18 @@ namespace js {
 
 static bool
 IsMarkedBlack(NativeObject* obj)
 {
     // Note: we assume conservatively that Nursery things will be live.
     if (!obj->isTenured())
         return true;
 
-    TenuredCell& tenured = obj->asTenured();
-    if (tenured.isMarked(BLACK) || tenured.arena()->allocatedDuringIncremental)
+    gc::TenuredCell& tenured = obj->asTenured();
+    if (tenured.isMarked(gc::BLACK) || tenured.arena()->allocatedDuringIncremental)
         return true;
 
     return false;
 }
 
 bool
 HeapSlot::preconditionForSet(NativeObject* owner, Kind kind, uint32_t slot) const
 {