Changeset 161169 in webkit

Timestamp:

Dec 30, 2013, 9:18:42 PM (13 years ago)

Author:

mark.lam@apple.com

Message:

CStack: Introducing Options::maxStackSize().
​https://bugs.webkit.org/show_bug.cgi?id=126321.

Not yet reviewed.

We need an option to limit the JS stack size. Currently, we just change
the JSStack class to use this limit.

• interpreter/JSStack.cpp:

(JSC::JSStack::JSStack):

• interpreter/JSStack.h:
• runtime/Options.h:

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/JSStack.cpp (modified) (1 diff)
• interpreter/JSStack.h (modified) (1 diff)
• runtime/Options.h (modified) (2 diffs)

branches/jsCStack/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-12-30  Mark Lam  <mark.lam@apple.com>
+
+        CStack: Introducing Options::maxStackSize().
+        https://bugs.webkit.org/show_bug.cgi?id=126321.
+
+        Not yet reviewed.
+
+        We need an option to limit the JS stack size. Currently, we just change
+        the JSStack class to use this limit.
+
+        * interpreter/JSStack.cpp:
+        (JSC::JSStack::JSStack):
+        * interpreter/JSStack.h:
+        * runtime/Options.h:
+
 2013-12-29  Filip Pizlo  <fpizlo@apple.com>
 

branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp

@@ -54 +54 @@
 {
 #if ENABLE(LLINT_C_LOOP)
-    size_t capacity = defaultCapacity;
+    size_t capacity = Options::maxStackSize();
     ASSERT(capacity && isPageAligned(capacity));
 
-    m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitSize), OSAllocator::JSVMStackPages);
+    m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity, commitSize), OSAllocator::JSVMStackPages);
     setStackLimit(highAddress());
     m_commitTop = highAddress();

branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h

@@ -76 +76 @@
         };
 
-        static const size_t defaultCapacity = 512 * 1024;
         static const size_t commitSize = 16 * 1024;
         // Allow 8k of excess registers before we start trying to reap the stack

branches/jsCStack/Source/JavaScriptCore/runtime/Options.h

@@ -30 +30 @@
 #include <stdint.h>
 #include <stdio.h>
+#include <wtf/StdLibExtras.h>
 
 namespace JSC {
@@ -94 +95 @@
     v(bool, useDFGJIT, true) \
     v(bool, useRegExpJIT, true) \
+    \
+    v(unsigned, maxStackSize, 4 * MB) \
     \
     v(bool, crashIfCantAllocateJITMemory, false) \