Attachment #214966 for bug #123209

View Details Raw Unified Return to Bug 123209



2013-10-23  Michael Saboff  <msaboff@apple.com>

        LLInt arity check exception processing should start unwinding from caller
        https://bugs.webkit.org/show_bug.cgi?id=123209

        Reviewed by NOBODY (OOPS!).

        Use the caller frame returned from slow_path_call_arityCheck to process exceptions.

        * llint/LowLevelInterpreter32_64.asm:
        * llint/LowLevelInterpreter64.asm:

2013-10-22  Andreas Kling  <akling@apple.com>

        Minor VM* -> VM& cleanups in HashTable and Keywords.

Lines 307-312 macro functionArityCheck(doneLabel, slow Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm_sec1
- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm +1 lines
307	biaeq t0, CodeBlock::m_numParameters[t1], doneLabel	307	biaeq t0, CodeBlock::m_numParameters[t1], doneLabel
308	cCall2(slow_path, cfr, PC) # This slow_path has a simple protocol: t0 = 0 => no error, t0 != 0 => error	308	cCall2(slow_path, cfr, PC) # This slow_path has a simple protocol: t0 = 0 => no error, t0 != 0 => error
309	btiz t0, .isArityFixupNeeded	309	btiz t0, .isArityFixupNeeded
		310	move t1, cfr # t1 contains caller frame
310	jmp _llint_throw_from_slow_path_trampoline	311	jmp _llint_throw_from_slow_path_trampoline
311		312
312	.isArityFixupNeeded:	313	.isArityFixupNeeded:

Lines 203-208 macro functionArityCheck(doneLabel, slow Source/JavaScriptCore/llint/LowLevelInterpreter64.asm_sec1
- Source/JavaScriptCore/llint/LowLevelInterpreter64.asm +1 lines
203	prepareStateForCCall()	203	prepareStateForCCall()
204	cCall2(slow_path, cfr, PC) # This slow_path has a simple protocol: t0 = 0 => no error, t0 != 0 => error	204	cCall2(slow_path, cfr, PC) # This slow_path has a simple protocol: t0 = 0 => no error, t0 != 0 => error
205	btiz t0, .isArityFixupNeeded	205	btiz t0, .isArityFixupNeeded
		206	move t1, cfr # t1 contains caller frame
206	jmp _llint_throw_from_slow_path_trampoline	207	jmp _llint_throw_from_slow_path_trampoline
207		208
208	.isArityFixupNeeded:	209	.isArityFixupNeeded:

Return to Bug 123209

Lines 1-3 Source/JavaScriptCore/ChangeLog_sec1
- Source/JavaScriptCore/ChangeLog +12 lines
		1	2013-10-23 Michael Saboff <msaboff@apple.com>
		2
		3	LLInt arity check exception processing should start unwinding from caller
		4	https://bugs.webkit.org/show_bug.cgi?id=123209
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Use the caller frame returned from slow_path_call_arityCheck to process exceptions.
		9
		10	* llint/LowLevelInterpreter32_64.asm:
		11	* llint/LowLevelInterpreter64.asm:
		12
1	2013-10-22 Andreas Kling <akling@apple.com>	13	2013-10-22 Andreas Kling <akling@apple.com>
2		14
3	Minor VM* -> VM& cleanups in HashTable and Keywords.	15	Minor VM* -> VM& cleanups in HashTable and Keywords.