Changeset 161361 in webkit

Timestamp:

Jan 6, 2014, 12:23:07 PM (13 years ago)

Author:

mark.lam@apple.com

Message:

CStack: jsStackLimit fixup should not exceed native stack limit.
​https://bugs.webkit.org/show_bug.cgi?id=126487.

Reviewed by Michael Saboff.

In doCallToJavaScript, we fixup VM::m_jsStackLimit once we know what the
stackPointerAtVMEntry is. However, we also need to ensure that the fixed
up jsStackLimit does not exceed the native stack limit. This check was
missing, and resulted in an assertion failure when running testapi on
platforms that have smaller stacks. This is now fixed.

• llint/LowLevelInterpreter64.asm:

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter64.asm (modified) (1 diff)

branches/jsCStack/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-06  Mark Lam  <mark.lam@apple.com>
+
+        CStack: jsStackLimit fixup should not exceed native stack limit.
+        https://bugs.webkit.org/show_bug.cgi?id=126487.
+
+        Reviewed by Michael Saboff.
+
+        In doCallToJavaScript, we fixup VM::m_jsStackLimit once we know what the
+        stackPointerAtVMEntry is. However, we also need to ensure that the fixed
+        up jsStackLimit does not exceed the native stack limit. This check was
+        missing, and resulted in an assertion failure when running testapi on
+        platforms that have smaller stacks. This is now fixed.
+
+        * llint/LowLevelInterpreter64.asm:
+
 2014-01-05  Michael Saboff  <msaboff@apple.com>
 

branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -129 +129 @@
     subp VM::stackPointerAtVMEntry[vm], temp2, temp2
     subp VM::m_jsStackLimit[vm], temp2, temp2
+if C_LOOP
+else
+    bpaeq temp2, VM::m_stackLimit[vm], .noNeedToCapJSStackToNativeStackLimit
+    loadp VM::m_stackLimit[vm], temp2
+.noNeedToCapJSStackToNativeStackLimit:
+end
     storep temp2, VM::m_jsStackLimit[vm]
     move sp, temp2