Bug 779560 - Revert worker stack limit in ASan builds to default state. r=bent
authorChristian Holler <choller@mozilla.com>
Tue, 28 Aug 2012 13:39:32 +0200
changeset 105684 1a3111e8b478f7899e8750626578153197c3b9f3
parent 105683 98a07ac71ddc0dea77ada9fec41ef56c756e2ee7
child 105685 03dce8e94aa9c66c6f824089317401800af09439
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewersbent
bugs779560
milestone18.0a1
Bug 779560 - Revert worker stack limit in ASan builds to default state. r=bent
dom/workers/RuntimeService.cpp
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -48,24 +48,18 @@ using mozilla::Preferences;
 
 // The size of the worker runtime heaps in bytes. May be changed via pref.
 #define WORKER_DEFAULT_RUNTIME_HEAPSIZE 32 * 1024 * 1024
 
 // The C stack size. We use the same stack size on all platforms for
 // consistency.
 #define WORKER_STACK_SIZE 256 * sizeof(size_t) * 1024
 
-// The stack limit the JS engine will check. 
-#ifdef MOZ_ASAN
-// For ASan, we need more stack space, so we use all that is available
-#define WORKER_CONTEXT_NATIVE_STACK_LIMIT WORKER_STACK_SIZE
-#else
 // Half the size of the actual C stack, to be safe.
 #define WORKER_CONTEXT_NATIVE_STACK_LIMIT 128 * sizeof(size_t) * 1024
-#endif
 
 // The maximum number of threads to use for workers, overridable via pref.
 #define MAX_WORKERS_PER_DOMAIN 10
 
 MOZ_STATIC_ASSERT(MAX_WORKERS_PER_DOMAIN >= 1,
                   "We should allow at least one worker per domain.");
 
 // The default number of seconds that close handlers will be allowed to run.