Changeset 75510 in webkit for trunk/Source/JavaScriptCore/jit/JIT.cpp

Timestamp:

Jan 11, 2011, 10:27:15 AM (14 years ago)

Author:

[email protected]

Message:

2011-01-10 Michael Saboff <​[email protected]>

Reviewed by Geoffrey Garen.

ASSERTION Failure in JSC::binaryChop
​https://bugs.webkit.org/show_bug.cgi?id=25614

Changed JITStubs::cti_register_file_check() to use the current stack's
return PC to find the bytecode for handling the exception in the prior
frame. Also added the appropriate arrity check routine call to the
JIT to bytecode vector (m_callReturnIndexVector) in the CodeBlock.

• jit/JIT.cpp: (JSC::JIT::privateCompile): Changed the arrity check call location so that it gets added to the m_calls list so that it's included in CodeBlock::m_callReturnIndexVector.
• jit/JITStubs.cpp: (JSC::DEFINE_STUB_FUNCTION): Use the current call frame's return PC.

2011-01-11 Michael Saboff <​[email protected]>

Reviewed by Geoffrey Garen.

ASSERTION Failure in JSC::binaryChop
​https://bugs.webkit.org/show_bug.cgi?id=25614

Added new test to check for proper handling of stack overflow
exceptions and arrity exceptions while close to the top of the stack.

• fast/js/script-tests/stack-overflow-arrity-catch.js: Added. (fWithTwoArgs): (test):
• fast/js/script-tests/stack-overflow-catch.js: Added. (test):
• fast/js/stack-overflow-arrity-catch-expected.txt: Added.
• fast/js/stack-overflow-arrity-catch.html: Added.
• fast/js/stack-overflow-catch-expected.txt: Added.
• fast/js/stack-overflow-catch.html: Added.

File:

• trunk/Source/JavaScriptCore/jit/JIT.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/jit/JIT.cpp

@@ -490 +490 @@
 
     Label arityCheck;
-    Call callArityCheck;
     if (m_codeBlock->codeType() == FunctionCode) {
         registerFileCheck.link(this);
@@ -505 +504 @@
         branch32(Equal, regT1, Imm32(m_codeBlock->m_numParameters)).linkTo(beginLabel, this);
         restoreArgumentReference();
-        callArityCheck = call();
-        move(regT0, callFrameRegister);
+
+        JITStubCall(this, m_codeBlock->m_isConstructor ? cti_op_construct_arityCheck : cti_op_call_arityCheck).call(callFrameRegister);
+
         jump(beginLabel);
     }
@@ -586 +586 @@
     }
 
-    if (m_codeBlock->codeType() == FunctionCode && functionEntryArityCheck) {
-        patchBuffer.link(callArityCheck, FunctionPtr(m_codeBlock->m_isConstructor ? cti_op_construct_arityCheck : cti_op_call_arityCheck));
+    if (m_codeBlock->codeType() == FunctionCode && functionEntryArityCheck)
         *functionEntryArityCheck = patchBuffer.locationOf(arityCheck);
-    }
 
     return patchBuffer.finalizeCode();