Title: [160221] trunk/Source/_javascript_Core
- Revision
- 160221
- Author
- [email protected]
- Date
- 2013-12-06 06:54:06 -0800 (Fri, 06 Dec 2013)
Log Message
REGRESSION(r160213): Crash in js/dom/JSON-parse.html
https://bugs.webkit.org/show_bug.cgi?id=125335
Reviewed by Mark Lam.
Changed _llint_op_catch to materialize the VM via the scope chain instead of
the CodeBlock. CallFrames always have a scope chain, but may have a null CodeBlock.
* llint/LowLevelInterpreter32_64.asm:
(_llint_op_catch):
* llint/LowLevelInterpreter64.asm:
(_llint_op_catch):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (160220 => 160221)
--- trunk/Source/_javascript_Core/ChangeLog 2013-12-06 13:58:38 UTC (rev 160220)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-12-06 14:54:06 UTC (rev 160221)
@@ -1,5 +1,20 @@
2013-12-05 Michael Saboff <[email protected]>
+ REGRESSION(r160213): Crash in js/dom/JSON-parse.html
+ https://bugs.webkit.org/show_bug.cgi?id=125335
+
+ Reviewed by Mark Lam.
+
+ Changed _llint_op_catch to materialize the VM via the scope chain instead of
+ the CodeBlock. CallFrames always have a scope chain, but may have a null CodeBlock.
+
+ * llint/LowLevelInterpreter32_64.asm:
+ (_llint_op_catch):
+ * llint/LowLevelInterpreter64.asm:
+ (_llint_op_catch):
+
+2013-12-05 Michael Saboff <[email protected]>
+
JSC: Simplify interface between throw and catch handler
https://bugs.webkit.org/show_bug.cgi?id=125328
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm (160220 => 160221)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2013-12-06 13:58:38 UTC (rev 160220)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2013-12-06 14:54:06 UTC (rev 160221)
@@ -1982,8 +1982,9 @@
# the interpreter's throw trampoline (see _llint_throw_trampoline).
# The throwing code must have known that we were throwing to the interpreter,
# and have set VM::targetInterpreterPCForThrow.
- loadp CodeBlock[cfr], t3
- loadp CodeBlock::m_vm[t3], t3
+ loadp ScopeChain[cfr], t3
+ andp MarkedBlockMask, t3
+ loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
loadp VM::callFrameForThrow[t3], cfr
loadi VM::targetInterpreterPCForThrow[t3], PC
loadi VM::m_exception + PayloadOffset[t3], t0
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm (160220 => 160221)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2013-12-06 13:58:38 UTC (rev 160220)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm 2013-12-06 14:54:06 UTC (rev 160221)
@@ -1785,8 +1785,9 @@
# the interpreter's throw trampoline (see _llint_throw_trampoline).
# The throwing code must have known that we were throwing to the interpreter,
# and have set VM::targetInterpreterPCForThrow.
- loadp CodeBlock[cfr], t3
- loadp CodeBlock::m_vm[t3], t3
+ loadp ScopeChain[cfr], t3
+ andp MarkedBlockMask, t3
+ loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
loadp VM::callFrameForThrow[t3], cfr
loadp CodeBlock[cfr], PB
loadp CodeBlock::m_instructions[PB], PB
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes