Title: [221210] trunk/Source/_javascript_Core
- Revision
- 221210
- Author
- [email protected]
- Date
- 2017-08-25 15:50:53 -0700 (Fri, 25 Aug 2017)
Log Message
Unreviewed. Fix 32-bit after r221196
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_catch):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (221209 => 221210)
--- trunk/Source/_javascript_Core/ChangeLog 2017-08-25 22:41:04 UTC (rev 221209)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-08-25 22:50:53 UTC (rev 221210)
@@ -1,3 +1,10 @@
+2017-08-25 Saam Barati <[email protected]>
+
+ Unreviewed. Fix 32-bit after r221196
+
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_catch):
+
2017-08-25 Chris Dumez <[email protected]>
Land stubs for File and Directory Entries API interfaces
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp (221209 => 221210)
--- trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2017-08-25 22:41:04 UTC (rev 221209)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2017-08-25 22:50:53 UTC (rev 221210)
@@ -862,13 +862,16 @@
// argument type proofs, storing locals to the buffer, etc
// https://bugs.webkit.org/show_bug.cgi?id=175598
- callOperation(operationTryOSREnterAtCatch, m_bytecodeOffset);
+ ValueProfileAndOperandBuffer* buffer = static_cast<ValueProfileAndOperandBuffer*>(currentInstruction[3].u.pointer);
+ if (buffer || !shouldEmitProfiling())
+ callOperation(operationTryOSREnterAtCatch, m_bytecodeOffset);
+ else
+ callOperation(operationTryOSREnterAtCatchAndValueProfile, m_bytecodeOffset);
auto skipOSREntry = branchTestPtr(Zero, returnValueGPR);
emitRestoreCalleeSaves();
jump(returnValueGPR);
skipOSREntry.link(this);
- if (shouldEmitProfiling()) {
- ValueProfileAndOperandBuffer* buffer = static_cast<ValueProfileAndOperandBuffer*>(currentInstruction[3].u.pointer);
+ if (buffer && shouldEmitProfiling()) {
buffer->forEach([&] (ValueProfileAndOperand& profile) {
JSValueRegs regs(regT1, regT0);
emitGetVirtualRegister(profile.m_operand, regs);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
