Changeset 161170 in webkit

Timestamp:

Dec 30, 2013 9:41:48 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

CStack: Fix JSStack::ensureCapacity() to match LLINT and JIT stack checks.
​https://bugs.webkit.org/show_bug.cgi?id=126328.

Not yet reviewed.

Also removed the now unused JSSTack::topOfStackForCapacityCheck().

• interpreter/JSStack.h:
• interpreter/JSStackInlines.h:

(JSC::JSStack::ensureCapacityFor):

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/JSStack.h (modified) (1 diff)
• interpreter/JSStackInlines.h (modified) (1 diff)

branches/jsCStack/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-12-30  Mark Lam  <mark.lam@apple.com>
+
+        CStack: Fix JSStack::ensureCapacity() to match LLINT and JIT stack checks.
+        https://bugs.webkit.org/show_bug.cgi?id=126328.
+
+        Not yet reviewed.
+
+        Also removed the now unused JSSTack::topOfStackForCapacityCheck().
+
+        * interpreter/JSStack.h:
+        * interpreter/JSStackInlines.h:
+        (JSC::JSStack::ensureCapacityFor):
+
 2013-12-30  Mark Lam  <mark.lam@apple.com>
 

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

@@ -128 +128 @@
         inline Register* topOfFrameFor(CallFrame*);
         inline Register* topOfStack();
-        inline Register* topOfStackForCapacityCheck();
 
 #if ENABLE(LLINT_C_LOOP)

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

@@ -40 +40 @@
 #else
     ASSERT(wtfThreadData().stack().isGrowingDownward());
-    Register* topOfStack = topOfStackForCapacityCheck();
-    if (newTopOfStack > topOfStack)
-        return true;
-    size_t neededCapacity = (topOfStack - newTopOfStack) * sizeof(Register);
-    return m_vm.isSafeToRecurse(neededCapacity);
-#endif
-}
-
-inline Register* JSStack::topOfStackForCapacityCheck()
-{
-#if !ENABLE(LLINT_C_LOOP)
-    // We're trying to get an estimate of the top of the stack for the purpose
-    // of a capacity check. If m_topCallFrame is 0, then we can't calculate an
-    // accurate top of stack value. Just use the current stack position as an
-    // estimate for the top of the stack from where JS code will start executing.
-    // This is conservative, but it will be safe.
-    if (!m_topCallFrame) {
-        Register* p = reinterpret_cast<Register*>(&p);
-        return p;
-    }
-#endif
-    return topOfStack() + 1;
+    return newTopOfStack >= m_vm.jsStackLimit();
+#endif
 }