Bug 831370 - Rename IsAddressableGCThing to GetAddressableGCThing, now that it returns void* r=terrence
authorJon Coppeard <jcoppeard@mozilla.com>
Wed, 16 Jan 2013 18:40:27 +0000
changeset 119141 15db83a182f50f40fe4333d6354e1015edb1d95d
parent 119140 08f1385d7f0fa7bd0e74e24823a047a280ea0ab6
child 119142 4959e4692993ebb0d5645da8d47337de9f8f32d7
push id24195
push userMs2ger@gmail.com
push dateSat, 19 Jan 2013 16:10:11 +0000
treeherdermozilla-central@02e12a80aef9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence
bugs831370
milestone21.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 831370 - Rename IsAddressableGCThing to GetAddressableGCThing, now that it returns void* r=terrence
js/src/gc/GCInternals.h
js/src/gc/RootMarking.cpp
js/src/gc/Verifier.cpp
--- a/js/src/gc/GCInternals.h
+++ b/js/src/gc/GCInternals.h
@@ -83,17 +83,17 @@ class IncrementalSafety
     }
 };
 
 IncrementalSafety
 IsIncrementalGCSafe(JSRuntime *rt);
 
 #ifdef JSGC_ROOT_ANALYSIS
 void *
-IsAddressableGCThing(JSRuntime *rt, uintptr_t w);
+GetAddressableGCThing(JSRuntime *rt, uintptr_t w);
 #endif
 
 #ifdef JS_GC_ZEAL
 void
 StartVerifyPreBarriers(JSRuntime *rt);
 
 void
 EndVerifyPreBarriers(JSRuntime *rt);
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -174,17 +174,17 @@ IsAddressableGCThing(JSRuntime *rt, uint
         *arenaHeader = aheader;
     if (thingKindPtr)
         *thingKindPtr = thingKind;
     return CGCT_VALID;
 }
 
 #ifdef JSGC_ROOT_ANALYSIS
 void *
-js::gc::IsAddressableGCThing(JSRuntime *rt, uintptr_t w)
+js::gc::GetAddressableGCThing(JSRuntime *rt, uintptr_t w)
 {
     void *thing;
     ArenaHeader *aheader;
     AllocKind thingKind;
     ConservativeGCTest status =
         IsAddressableGCThing(rt, w, false, &thingKind, &aheader, &thing);
     if (status != CGCT_VALID)
         return NULL;
--- a/js/src/gc/Verifier.cpp
+++ b/js/src/gc/Verifier.cpp
@@ -46,17 +46,17 @@ struct Rooter {
 static void
 CheckStackRoot(JSRuntime *rt, uintptr_t *w, Rooter *begin, Rooter *end)
 {
     /* Mark memory as defined for valgrind, as in MarkWordConservatively. */
 #ifdef MOZ_VALGRIND
     VALGRIND_MAKE_MEM_DEFINED(&w, sizeof(w));
 #endif
 
-    void *thing = IsAddressableGCThing(rt, *w);
+    void *thing = GetAddressableGCThing(rt, *w);
     if (!thing)
         return;
 
     /* Don't check atoms as these will never be subject to generational collection. */
     if (IsAtomsCompartment(reinterpret_cast<Cell *>(thing)->compartment()))
         return;
 
     /*