Diff
Modified: trunk/JSTests/ChangeLog (263053 => 263054)
--- trunk/JSTests/ChangeLog 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/JSTests/ChangeLog 2020-06-15 19:50:03 UTC (rev 263054)
@@ -1,5 +1,15 @@
2020-06-15 Keith Miller <[email protected]>
+ CheckIsConstant should not use BadCache exit kind
+ https://bugs.webkit.org/show_bug.cgi?id=213141
+
+ Reviewed by Yusuke Suzuki.
+
+ * stress/check-is-constant-non-cell-should-not-array-profile-during-osr-exit.js: Added.
+ (foo.bar):
+
+2020-06-15 Keith Miller <[email protected]>
+
JIT thunks should work on arm64_32
https://bugs.webkit.org/show_bug.cgi?id=213103
Added: trunk/JSTests/stress/check-is-constant-non-cell-should-not-array-profile-during-osr-exit.js (0 => 263054)
--- trunk/JSTests/stress/check-is-constant-non-cell-should-not-array-profile-during-osr-exit.js (rev 0)
+++ trunk/JSTests/stress/check-is-constant-non-cell-should-not-array-profile-during-osr-exit.js 2020-06-15 19:50:03 UTC (rev 263054)
@@ -0,0 +1,16 @@
+function foo() {
+ function bar(a0) {
+ try {
+ for (let q of a0) {}
+ p.isFrozen();
+ } catch {}
+ return bar;
+ }
+ let p = new Proxy([], { get: bar });
+ bar(p);
+}
+
+
+for (let i=0; i<100; i++) {
+ foo();
+}
\ No newline at end of file
Modified: trunk/Source/_javascript_Core/ChangeLog (263053 => 263054)
--- trunk/Source/_javascript_Core/ChangeLog 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-06-15 19:50:03 UTC (rev 263054)
@@ -1,3 +1,63 @@
+2020-06-15 Keith Miller <[email protected]>
+
+ CheckIsConstant should not use BadCache exit kind
+ https://bugs.webkit.org/show_bug.cgi?id=213141
+
+ Reviewed by Yusuke Suzuki.
+
+ The BadCache exit kind causes the OSR exit compilers to try to
+ update ArrayProfiles. This is just incorrect for CheckIsConstant
+ since the node's origin may not even have an
+ ArrayProfile... BadCache also strongly assumes the value it's
+ profiling is a cell, which is clearly not always the case for
+ CheckIsConstant.
+
+ CheckIsConstant now uses the BadConstantValue (BadValue conflicts
+ with macros exported by X11 on GTK) exit kind for all use kinds,
+ which is just a rename of BadCell. All existing places where we
+ can emit a CheckIsConstant already have a story for BadConstantValue.
+
+ * bytecode/CallLinkStatus.cpp:
+ (JSC::CallLinkStatus::computeFromLLInt):
+ (JSC::CallLinkStatus::computeExitSiteData):
+ * bytecode/ExitKind.cpp:
+ (JSC::exitKindToString):
+ * bytecode/ExitKind.h:
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::handleInlining):
+ (JSC::DFG::ByteCodeParser::handleIntrinsicCall):
+ (JSC::DFG::ByteCodeParser::handleModuleNamespaceLoad):
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ (JSC::DFG::ByteCodeParser::handlePutByVal):
+ (JSC::DFG::ByteCodeParser::handleCreateInternalFieldObject):
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize):
+ * dfg/DFGDoesGC.cpp:
+ (JSC::DFG::doesGC):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::isPseudoTerminal):
+ * dfg/DFGNodeType.h:
+ * dfg/DFGPredictionPropagationPhase.cpp:
+ * dfg/DFGSafeToExecute.h:
+ (JSC::DFG::safeToExecute):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileCheckIsConstant):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileNode):
+ (JSC::FTL::DFG::LowerDFGToB3::compileCheckIsConstant):
+ (JSC::FTL::DFG::LowerDFGToB3::compileCheckBadValue):
+ (JSC::FTL::DFG::LowerDFGToB3::compileCheckBadCell): Deleted.
+
2020-06-15 Yusuke Suzuki <[email protected]>
Webkit Feature BigInt on webkit.org
Modified: trunk/Source/_javascript_Core/bytecode/CallLinkStatus.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/bytecode/CallLinkStatus.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/bytecode/CallLinkStatus.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -57,7 +57,7 @@
UNUSED_PARAM(profiledBlock);
UNUSED_PARAM(bytecodeIndex);
#if ENABLE(DFG_JIT)
- if (profiledBlock->unlinkedCodeBlock()->hasExitSite(DFG::FrequentExitSite(bytecodeIndex, BadCell))) {
+ if (profiledBlock->unlinkedCodeBlock()->hasExitSite(DFG::FrequentExitSite(bytecodeIndex, BadConstantValue))) {
// We could force this to be a closure call, but instead we'll just assume that it
// takes slow path.
return takesSlowPath();
@@ -138,7 +138,7 @@
};
auto badFunction = [&] (ExitingInlineKind inlineKind) -> ExitFlag {
- return ExitFlag(codeBlock->hasExitSite(locker, DFG::FrequentExitSite(bytecodeIndex, BadCell, ExitFromAnything, inlineKind)), inlineKind);
+ return ExitFlag(codeBlock->hasExitSite(locker, DFG::FrequentExitSite(bytecodeIndex, BadConstantValue, ExitFromAnything, inlineKind)), inlineKind);
};
exitSiteData.takesSlowPath |= takesSlowPath(ExitFromNotInlined);
Modified: trunk/Source/_javascript_Core/bytecode/ExitKind.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/bytecode/ExitKind.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/bytecode/ExitKind.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -38,8 +38,8 @@
return "Unset";
case BadType:
return "BadType";
- case BadCell:
- return "BadCell";
+ case BadConstantValue:
+ return "BadConstantValue";
case BadIdent:
return "BadIdent";
case BadExecutable:
Modified: trunk/Source/_javascript_Core/bytecode/ExitKind.h (263053 => 263054)
--- trunk/Source/_javascript_Core/bytecode/ExitKind.h 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/bytecode/ExitKind.h 2020-06-15 19:50:03 UTC (rev 263054)
@@ -30,7 +30,7 @@
enum ExitKind : uint8_t {
ExitKindUnset,
BadType, // We exited because a type prediction was wrong.
- BadCell, // We exited because we made an incorrect assumption about what cell we would see. Usually used for function checks.
+ BadConstantValue, // We exited because we made an incorrect assumption about what value we would see. Usually used for function checks.
BadIdent, // We exited because we made an incorrect assumption about what identifier we would see. Usually used for cached Id check in get_by_val.
BadExecutable, // We exited because we made an incorrect assumption about what executable we would see.
BadCache, // We exited because an inline cache was wrong.
Modified: trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h 2020-06-15 19:50:03 UTC (rev 263054)
@@ -4278,7 +4278,7 @@
break;
case ForceOSRExit:
- case CheckBadCell:
+ case CheckBadValue:
m_state.setIsValid(false);
break;
Modified: trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -2231,7 +2231,7 @@
registerOffset, prediction);
VERBOSE_LOG("We added a call in the slow path\n");
} else {
- addToGraph(CheckBadCell);
+ addToGraph(CheckBadValue);
addToGraph(Phantom, myCallTargetNode);
emitArgumentPhantoms(registerOffset, argumentCountIncludingThis);
@@ -2742,7 +2742,7 @@
if (argumentCountIncludingThis < 2)
return false;
- if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell) || m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadType))
+ if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue) || m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadType))
return false;
insertChecks();
@@ -2854,7 +2854,7 @@
if (intrinsic == RegExpTestIntrinsic) {
// Don't inline intrinsic if we exited due to one of the primordial RegExp checks failing.
- if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell))
+ if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue))
return false;
JSGlobalObject* globalObject = m_inlineStackTop->m_codeBlock->globalObject();
@@ -2976,7 +2976,7 @@
return false;
// Don't inline intrinsic if we exited due to one of the primordial RegExp checks failing.
- if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell))
+ if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue))
return false;
JSGlobalObject* globalObject = m_inlineStackTop->m_codeBlock->globalObject();
@@ -3211,7 +3211,7 @@
case JSMapValuesIntrinsic:
case JSSetEntriesIntrinsic:
case JSSetValuesIntrinsic: {
- if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell) || m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadType))
+ if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue) || m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadType))
return false;
insertChecks();
@@ -3919,7 +3919,7 @@
bool ByteCodeParser::handleModuleNamespaceLoad(VirtualRegister result, SpeculatedType prediction, Node* base, GetByStatus getById)
{
- if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell))
+ if (m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue))
return false;
addToGraph(CheckIsConstant, OpInfo(m_graph.freeze(getById.moduleNamespaceObject())), Edge(base, CellUse));
@@ -5195,7 +5195,7 @@
JSCell* cachedFunction = bytecode.metadata(codeBlock).m_cachedCallee.unvalidatedGet();
if (cachedFunction
&& cachedFunction != JSCell::seenMultipleCalleeObjects()
- && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell)) {
+ && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue)) {
ASSERT(cachedFunction->inherits<JSFunction>(*m_vm));
FrozenValue* frozen = m_graph.freeze(cachedFunction);
@@ -5255,7 +5255,7 @@
JSCell* cachedFunction = bytecode.metadata(codeBlock).m_cachedCallee.unvalidatedGet();
if (cachedFunction
&& cachedFunction != JSCell::seenMultipleCalleeObjects()
- && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell)
+ && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue)
&& cachedFunction == (bytecode.m_isInternalPromise ? globalObject->internalPromiseConstructor() : globalObject->promiseConstructor())) {
FrozenValue* frozen = m_graph.freeze(cachedFunction);
addToGraph(CheckIsConstant, OpInfo(frozen), callee);
@@ -5278,7 +5278,7 @@
JSCell* cachedFunction = bytecode.metadata(codeBlock).m_cachedCallee.unvalidatedGet();
if (cachedFunction
&& cachedFunction != JSCell::seenMultipleCalleeObjects()
- && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell)) {
+ && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue)) {
ASSERT(cachedFunction->inherits<JSFunction>(*m_vm));
FrozenValue* frozen = m_graph.freeze(cachedFunction);
@@ -5963,7 +5963,7 @@
CacheableIdentifier identifier;
if (!m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadIdent)
&& !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadType)
- && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell)) {
+ && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue)) {
// FIXME: In the future, we should be able to do something like MultiGetByOffset in a multi identifier mode.
// That way, we could both switch on multiple structures and multiple identifiers (or int 32 properties).
@@ -6188,7 +6188,7 @@
if (!m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadIdent)
&& !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadType)
- && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell)) {
+ && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue)) {
if (CacheableIdentifier identifier = deleteByStatus.singleIdentifier()) {
UniquedStringImpl* uid = identifier.uid();
@@ -8231,7 +8231,7 @@
&& !byValInfo->tookSlowPath
&& !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadIdent)
&& !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadType)
- && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell)) {
+ && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue)) {
compiledAsPutById = true;
identifier = byValInfo->cachedId;
identifierNumber = m_graph.identifiers().ensure(identifier.uid());
@@ -8335,7 +8335,7 @@
JSCell* cachedFunction = bytecode.metadata(codeBlock).m_cachedCallee.unvalidatedGet();
if (cachedFunction
&& cachedFunction != JSCell::seenMultipleCalleeObjects()
- && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell)) {
+ && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadConstantValue)) {
ASSERT(cachedFunction->inherits<JSFunction>(*m_vm));
FrozenValue* frozen = m_graph.freeze(cachedFunction);
Modified: trunk/Source/_javascript_Core/dfg/DFGClobberize.h (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGClobberize.h 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGClobberize.h 2020-06-15 19:50:03 UTC (rev 263054)
@@ -487,7 +487,7 @@
case EntrySwitch:
case ForceOSRExit:
case CPUIntrinsic:
- case CheckBadCell:
+ case CheckBadValue:
case Return:
case Unreachable:
case CheckTierUpInLoop:
Modified: trunk/Source/_javascript_Core/dfg/DFGDoesGC.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGDoesGC.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGDoesGC.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -205,7 +205,7 @@
case GetEnumerableLength:
case FiatInt52:
case BooleanToNumber:
- case CheckBadCell:
+ case CheckBadValue:
case BottomValue:
case PhantomNewObject:
case PhantomNewFunction:
Modified: trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -2731,7 +2731,7 @@
case SuperSamplerBegin:
case SuperSamplerEnd:
case ForceOSRExit:
- case CheckBadCell:
+ case CheckBadValue:
case CheckNotEmpty:
case AssertNotEmpty:
case CheckTraps:
Modified: trunk/Source/_javascript_Core/dfg/DFGNode.h (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGNode.h 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGNode.h 2020-06-15 19:50:03 UTC (rev 263054)
@@ -1575,7 +1575,7 @@
{
switch (op()) {
case ForceOSRExit:
- case CheckBadCell:
+ case CheckBadValue:
return true;
default:
return false;
Modified: trunk/Source/_javascript_Core/dfg/DFGNodeType.h (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGNodeType.h 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGNodeType.h 2020-06-15 19:50:03 UTC (rev 263054)
@@ -276,7 +276,7 @@
macro(CheckIsConstant, NodeMustGenerate) \
macro(CheckNotEmpty, NodeMustGenerate) \
macro(AssertNotEmpty, NodeMustGenerate) \
- macro(CheckBadCell, NodeMustGenerate) \
+ macro(CheckBadValue, NodeMustGenerate) \
macro(CheckInBounds, NodeMustGenerate | NodeResultJS) \
macro(CheckIdent, NodeMustGenerate) \
macro(CheckTypeInfoFlags, NodeMustGenerate) /* Takes an OpInfo with the flags you want to test are set */\
Modified: trunk/Source/_javascript_Core/dfg/DFGPredictionPropagationPhase.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGPredictionPropagationPhase.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGPredictionPropagationPhase.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -1408,7 +1408,7 @@
case CheckNotEmpty:
case AssertNotEmpty:
case CheckIdent:
- case CheckBadCell:
+ case CheckBadValue:
case PutStructure:
case Phantom:
case Check:
Modified: trunk/Source/_javascript_Core/dfg/DFGSafeToExecute.h (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGSafeToExecute.h 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGSafeToExecute.h 2020-06-15 19:50:03 UTC (rev 263054)
@@ -530,7 +530,7 @@
case ArrayifyToStructure:
case PutClosureVar:
case PutGlobalVariable:
- case CheckBadCell:
+ case CheckBadValue:
case RegExpExec:
case RegExpExecNonGlobalOrSticky:
case RegExpTest:
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -9663,7 +9663,7 @@
{
if (node->child1().useKind() == CellUse) {
SpeculateCellOperand cell(this, node->child1());
- speculationCheck(BadCell, JSValueSource::unboxedCell(cell.gpr()), node->child1(), m_jit.branchWeakPtr(JITCompiler::NotEqual, cell.gpr(), node->cellOperand()->cell()));
+ speculationCheck(BadConstantValue, JSValueSource::unboxedCell(cell.gpr()), node->child1(), m_jit.branchWeakPtr(JITCompiler::NotEqual, cell.gpr(), node->cellOperand()->cell()));
} else {
ASSERT(!node->constant()->value().isCell() || !node->constant()->value());
JSValueOperand operand(this, node->child1());
@@ -9670,10 +9670,10 @@
JSValueRegs regs = operand.jsValueRegs();
#if USE(JSVALUE64)
- speculationCheck(BadCache, regs, node->child1(), m_jit.branch64(JITCompiler::NotEqual, regs.gpr(), TrustedImm64(JSValue::encode(node->constant()->value()))));
+ speculationCheck(BadConstantValue, regs, node->child1(), m_jit.branch64(JITCompiler::NotEqual, regs.gpr(), TrustedImm64(JSValue::encode(node->constant()->value()))));
#else
- speculationCheck(BadCache, regs, node->child1(), m_jit.branch32(JITCompiler::NotEqual, regs.tagGPR(), TrustedImm32(node->constant()->value().tag())));
- speculationCheck(BadCache, regs, node->child1(), m_jit.branch32(JITCompiler::NotEqual, regs.payloadGPR(), TrustedImm32(node->constant()->value().payload())));
+ speculationCheck(BadConstantValue, regs, node->child1(), m_jit.branch32(JITCompiler::NotEqual, regs.tagGPR(), TrustedImm32(node->constant()->value().tag())));
+ speculationCheck(BadConstantValue, regs, node->child1(), m_jit.branch32(JITCompiler::NotEqual, regs.payloadGPR(), TrustedImm32(node->constant()->value().payload())));
#endif
}
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -4239,7 +4239,7 @@
case MultiGetByOffset:
case MultiPutByOffset:
case MultiDeleteByOffset:
- case CheckBadCell:
+ case CheckBadValue:
case BottomValue:
case PhantomNewObject:
case PhantomNewFunction:
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -5544,7 +5544,7 @@
case MultiPutByOffset:
case MultiDeleteByOffset:
case FiatInt52:
- case CheckBadCell:
+ case CheckBadValue:
case BottomValue:
case PhantomNewObject:
case PhantomNewFunction:
Modified: trunk/Source/_javascript_Core/ftl/FTLCapabilities.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/ftl/FTLCapabilities.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/ftl/FTLCapabilities.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -159,7 +159,7 @@
case InvalidationPoint:
case StringCharAt:
case CheckIsConstant:
- case CheckBadCell:
+ case CheckBadValue:
case CheckNotEmpty:
case AssertNotEmpty:
case CheckIdent:
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (263053 => 263054)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2020-06-15 19:21:17 UTC (rev 263053)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2020-06-15 19:50:03 UTC (rev 263054)
@@ -909,8 +909,8 @@
case AssertNotEmpty:
compileAssertNotEmpty();
break;
- case CheckBadCell:
- compileCheckBadCell();
+ case CheckBadValue:
+ compileCheckBadValue();
break;
case CheckIdent:
compileCheckIdent();
@@ -3650,7 +3650,7 @@
LValue cell = lowCell(m_node->child1());
speculate(
- BadCell, jsValueValue(cell), m_node->child1().node(),
+ BadConstantValue, jsValueValue(cell), m_node->child1().node(),
m_out.notEqual(cell, weakPointer(m_node->cellOperand()->cell())));
} else {
LValue value = lowJSValue(m_node->child1());
@@ -3657,14 +3657,14 @@
ASSERT(!m_node->constant()->value().isCell() || !m_node->constant()->value());
speculate(
- BadType, jsValueValue(value), m_node->child1().node(),
+ BadConstantValue, jsValueValue(value), m_node->child1().node(),
m_out.notEqual(value, m_out.constInt64(JSValue::encode(m_node->constant()->value()))));
}
}
- void compileCheckBadCell()
+ void compileCheckBadValue()
{
- terminate(BadCell);
+ terminate(BadConstantValue);
}
void compileCheckNotEmpty()