Title: [265136] trunk/Source/_javascript_Core
- Revision
- 265136
- Author
- [email protected]
- Date
- 2020-07-31 00:45:16 -0700 (Fri, 31 Jul 2020)
Log Message
[JSC] Follow-up changes after r265036
https://bugs.webkit.org/show_bug.cgi?id=214982
Reviewed by Darin Adler.
* dfg/DFGOSRExit.cpp:
(JSC::DFG::OSRExit::compileExit): Remove dupe definitions in OSRExit.
* jit/JITCall32_64.cpp:
(JSC::JIT::emit_op_iterator_open): We should use emitJumpSlowCaseIfNotJSCell(regT1).
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (265135 => 265136)
--- trunk/Source/_javascript_Core/ChangeLog 2020-07-31 07:15:25 UTC (rev 265135)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-07-31 07:45:16 UTC (rev 265136)
@@ -1,3 +1,15 @@
+2020-07-31 Yusuke Suzuki <[email protected]>
+
+ [JSC] Follow-up changes after r265036
+ https://bugs.webkit.org/show_bug.cgi?id=214982
+
+ Reviewed by Darin Adler.
+
+ * dfg/DFGOSRExit.cpp:
+ (JSC::DFG::OSRExit::compileExit): Remove dupe definitions in OSRExit.
+ * jit/JITCall32_64.cpp:
+ (JSC::JIT::emit_op_iterator_open): We should use emitJumpSlowCaseIfNotJSCell(regT1).
+
2020-07-30 Keith Miller <[email protected]>
Remove UB from nonPACBitsMask computation
Modified: trunk/Source/_javascript_Core/dfg/DFGOSRExit.cpp (265135 => 265136)
--- trunk/Source/_javascript_Core/dfg/DFGOSRExit.cpp 2020-07-31 07:15:25 UTC (rev 265135)
+++ trunk/Source/_javascript_Core/dfg/DFGOSRExit.cpp 2020-07-31 07:45:16 UTC (rev 265136)
@@ -603,8 +603,7 @@
case Constant:
sideState->tmps[i] = recovery.constant();
break;
-
-#if USE(JSVALUE64)
+
case UnboxedInt32InGPR:
case Int32DisplacedInJSStack: {
sideState->tmps[i] = jsNumber(static_cast<int32_t>(tmpScratch[i + tmpOffset]));
@@ -611,6 +610,12 @@
break;
}
+ case UnboxedBooleanInGPR: {
+ sideState->tmps[i] = jsBoolean(static_cast<bool>(tmpScratch[i + tmpOffset]));
+ break;
+ }
+
+#if USE(JSVALUE64)
case BooleanDisplacedInJSStack:
case CellDisplacedInJSStack:
case UnboxedCellInGPR:
@@ -619,19 +624,7 @@
sideState->tmps[i] = reinterpret_cast<JSValue*>(tmpScratch)[i + tmpOffset];
break;
}
-
- case UnboxedBooleanInGPR: {
- sideState->tmps[i] = jsBoolean(static_cast<bool>(tmpScratch[i + tmpOffset]));
- break;
- }
-
#else // USE(JSVALUE32_64)
- case UnboxedInt32InGPR:
- case Int32DisplacedInJSStack: {
- sideState->tmps[i] = jsNumber(static_cast<int32_t>(tmpScratch[i + tmpOffset]));
- break;
- }
-
case InPair:
case DisplacedInJSStack: {
sideState->tmps[i] = reinterpret_cast<JSValue*>(tmpScratch)[i + tmpOffset];
@@ -645,15 +638,13 @@
break;
}
- case BooleanDisplacedInJSStack:
- case UnboxedBooleanInGPR: {
+ case BooleanDisplacedInJSStack: {
sideState->tmps[i] = jsBoolean(static_cast<bool>(tmpScratch[i + tmpOffset]));
break;
}
-
#endif // USE(JSVALUE64)
- default:
+ default:
RELEASE_ASSERT_NOT_REACHED();
break;
}
Modified: trunk/Source/_javascript_Core/jit/JITCall32_64.cpp (265135 => 265136)
--- trunk/Source/_javascript_Core/jit/JITCall32_64.cpp 2020-07-31 07:15:25 UTC (rev 265135)
+++ trunk/Source/_javascript_Core/jit/JITCall32_64.cpp 2020-07-31 07:45:16 UTC (rev 265136)
@@ -389,13 +389,12 @@
compileOpCall<OpIteratorOpen>(instruction, m_callLinkInfoIndex++);
- VirtualRegister vr = destinationFor(bytecode, m_bytecodeIndex.checkpoint()).virtualRegister();
advanceToNextCheckpoint();
// call result (iterator) is in regT1 (tag)/regT0 (payload)
const Identifier* ident = &vm().propertyNames->next;
- emitJumpSlowCaseIfNotJSCell(vr, regT1);
+ emitJumpSlowCaseIfNotJSCell(regT1);
GPRReg tagIteratorGPR = regT1;
GPRReg payloadIteratorGPR = regT0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes