Backed out changeset cb0b6f2f3ca9 (bug 958940)
authorRandell Jesup <rjesup@jesup.org>
Mon, 07 Apr 2014 15:35:58 -0400
changeset 195824 6b85b16dc2267eb111b349f8c930deb5d5c18cbc
parent 195823 6d276863a7e394a62e83a10d1073aef342292022
child 195825 206169eef9952d56395aaf20b96acfb6d243fc64
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs958940
milestone31.0a1
backs outcb0b6f2f3ca909dd8c075bb4ac653d8fb4291a54
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
Backed out changeset cb0b6f2f3ca9 (bug 958940)
js/src/gc/RootMarking.cpp
js/src/vm/Runtime.cpp
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -309,17 +309,17 @@ MarkConservativeStackRoots(JSTracer *trc
 #ifdef JS_THREADSAFE
         JS_ASSERT(!rt->requestDepth);
 #endif
         return;
     }
 
     uintptr_t *stackMin, *stackEnd;
 #if JS_STACK_GROWTH_DIRECTION > 0
-    stackMin = reinterpret_cast<uintptr_t *>(rt->nativeStackBase);
+    stackMin = rt->nativeStackBase;
     stackEnd = cgcd->nativeStackTop;
 #else
     stackMin = cgcd->nativeStackTop + 1;
     stackEnd = reinterpret_cast<uintptr_t *>(rt->nativeStackBase);
 #endif
 
     JS_ASSERT(stackMin <= stackEnd);
     MarkRangeConservativelyAndSkipIon(trc, rt, stackMin, stackEnd);
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -313,17 +313,17 @@ JSRuntime::JSRuntime(JSRuntime *parentRu
     /* Initialize infallibly first, so we can goto bad and JS_DestroyRuntime. */
     JS_INIT_CLIST(&onNewGlobalObjectWatchers);
 
     PodZero(&debugHooks);
     PodArrayZero(nativeStackQuota);
     PodZero(&asmJSCacheOps);
 
 #if JS_STACK_GROWTH_DIRECTION > 0
-    mainThread.nativeStackLimit = UINTPTR_MAX;
+    nativeStackLimit = UINTPTR_MAX;
 #endif
 }
 
 static bool
 JitSupportsFloatingPoint()
 {
 #if defined(JS_ION)
     if (!JSC::MacroAssembler::supportsFloatingPoint())