Changeset 74402 in webkit

Timestamp:

Dec 20, 2010 11:36:37 PM (13 years ago)

Author:

barraclough@apple.com

Message:

Bug 26276 - Need a mechanism to determine stack extent

Reviewed by Oliver Hunt.

JavaScriptCore:

This patch adds accurate stack size calculation for:

DARWIN, WINDOWS, QNX, UNIX

We still need to fix:

SOLARIS, OPENBSD, SYMBIAN, HAIKU, WINCE

• wtf/StackBounds.cpp:

(WTF::StackBounds::initialize):

LayoutTests:

Correctly measuring available stack increases the size of expression we can handle!

• fast/js/large-expressions-expected.txt:
• fast/js/script-tests/large-expressions.js:

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/StackBounds.cpp (modified) (7 diffs)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/large-expressions-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/script-tests/large-expressions.js (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-12-20  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Bug 26276 - Need a mechanism to determine stack extent
+
+        This patch adds accurate stack size calculation for:
+            DARWIN, WINDOWS, QNX, UNIX
+        We still need to fix:
+            SOLARIS, OPENBSD, SYMBIAN, HAIKU, WINCE
+
+        * wtf/StackBounds.cpp:
+        (WTF::StackBounds::initialize):
+
 2010-12-20  Gavin Barraclough  <barraclough@apple.com>
 

trunk/JavaScriptCore/wtf/StackBounds.cpp

@@ -58 +58 @@
 namespace WTF {
 
+// Bug 26276 - Need a mechanism to determine stack extent
+//
+// These platforms should now be working correctly:
+//     DARWIN, WINDOWS, QNX, UNIX
+// These platforms are not:
+//     SOLARIS, OPENBSD, SYMBIAN, HAIKU, WINCE
+//
+// FIXME: remove this! - this code unsafely guesses at stack sizes!
+#if OS(SOLARIS) || OS(OPENBSD) || OS(SYMBIAN) || OS(HAIKU) || OS(WINCE)
 // Based on the current limit used by the JSC parser, guess the stack size.
 static const ptrdiff_t estimatedStackSize = 128 * sizeof(void*) * 1024;
-
 // This method assumes the stack is growing downwards.
 static void* estimateStackBound(void* origin)
@@ -66 +74 @@
     return static_cast<char*>(origin) - estimatedStackSize;
 }
+#endif
 
 #if OS(DARWIN)
@@ -73 +82 @@
     pthread_t thread = pthread_self();
     m_origin = pthread_get_stackaddr_np(thread);
-    m_bound = estimateStackBound(m_origin);
+    m_bound = static_cast<char*>(m_origin) - pthread_get_stacksize_np(thread);
 }
 
@@ -89 +98 @@
     }
     m_origin = static_cast<void*>(pTib->StackBase);
+    m_bound = static_cast<void*>(pTib->StackLimit);
 #elif OS(WINDOWS) && CPU(X86) && COMPILER(GCC)
     // offset 0x18 from the FS segment register gives a pointer to
@@ -97 +107 @@
         );
     m_origin = static_cast<void*>(pTib->StackBase);
+    m_bound = static_cast<void*>(pTib->StackLimit);
 #elif OS(WINDOWS) && CPU(X86_64)
     PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
     m_origin = reinterpret_cast<void*>(pTib->StackBase);
+    m_bound = reinterpret_cast<void*>(pTib->StackLimit);
 #else
 #error Need a way to get the stack bounds on this platform (Windows)
 #endif
-    m_bound = estimateStackBound(m_origin);
 }
 
@@ -128 +139 @@
     ASSERT(stackBase);
 
+    m_bound = stackBase;
     m_origin = static_cast<char*>(stackBase) + stackSize;
-    m_bound = estimateStackBound(m_origin);
 }
 
@@ -195 +206 @@
     ASSERT(stackBase);
     pthread_attr_destroy(&sattr);
+    m_bound = stackBase;
     m_origin = static_cast<char*>(stackBase) + stackSize;
-    m_bound = estimateStackBound(m_origin);
 }
 

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-20  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Bug 26276 - Need a mechanism to determine stack extent
+
+        Correctly measuring available stack increases the size of expression we can handle!
+
+        * fast/js/large-expressions-expected.txt:
+        * fast/js/script-tests/large-expressions.js:
+
 2010-12-20  Yuzo Fujishima  <yuzo@google.com>
 

trunk/LayoutTests/fast/js/large-expressions-expected.txt

@@ -6 +6 @@
 PASS eval(repeatedExpression("letterA", "+", 100)) is repeatedString("a", 100)
 PASS eval(repeatedExpression("letterA", "+", 1000)) is repeatedString("a", 1000)
-PASS eval(repeatedExpression("letterA", "+", 10000)) threw exception SyntaxError: Expression too deep.
+PASS eval(repeatedExpression("letterA", "+", 10000)) is repeatedString("a", 10000)
 PASS eval(repeatedExpression("letterA", "+", 100000)) threw exception SyntaxError: Expression too deep.
 PASS successfullyParsed is true

trunk/LayoutTests/fast/js/script-tests/large-expressions.js

@@ -27 +27 @@
 shouldBe('eval(repeatedExpression("letterA", "+", 100))', 'repeatedString("a", 100)');
 shouldBe('eval(repeatedExpression("letterA", "+", 1000))', 'repeatedString("a", 1000)');
-shouldThrow('eval(repeatedExpression("letterA", "+", 10000))', '"SyntaxError: Expression too deep"');
+shouldBe('eval(repeatedExpression("letterA", "+", 10000))', 'repeatedString("a", 10000)');
 shouldThrow('eval(repeatedExpression("letterA", "+", 100000))', '"SyntaxError: Expression too deep"');