Bug 958940 - Fix SpiderMonkey build failure on Linux/PA-RISC. r=nbp
☠☠ backed out by 6b85b16dc226 ☠ ☠
authorAaro Koskinen <aaro.koskinen@iki.fi>
Mon, 07 Apr 2014 09:39:33 -0700
changeset 195816 cb0b6f2f3ca909dd8c075bb4ac653d8fb4291a54
parent 195815 b4cf96fc38ec3185acf5674b659632b9dbaed363
child 195817 14b5fbfa2163b634fcdad1249441e0fb789dc0ef
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)
reviewersnbp
bugs958940
milestone31.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 958940 - Fix SpiderMonkey build failure on Linux/PA-RISC. r=nbp
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 = rt->nativeStackBase;
+    stackMin = reinterpret_cast<uintptr_t *>(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
-    nativeStackLimit = UINTPTR_MAX;
+    mainThread.nativeStackLimit = UINTPTR_MAX;
 #endif
 }
 
 static bool
 JitSupportsFloatingPoint()
 {
 #if defined(JS_ION)
     if (!JSC::MacroAssembler::supportsFloatingPoint())