Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (234096 => 234097)
--- trunk/Source/_javascript_Core/ChangeLog 2018-07-23 14:12:37 UTC (rev 234096)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-07-23 16:13:40 UTC (rev 234097)
@@ -1,3 +1,18 @@
+2018-07-23 Filip Pizlo <[email protected]>
+
+ Unreviewed, fix no-JIT build.
+
+ * bytecode/CallLinkStatus.cpp:
+ (JSC::CallLinkStatus::computeFor):
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::finalizeUnconditionally):
+ * bytecode/GetByIdStatus.cpp:
+ (JSC::GetByIdStatus::computeFor):
+ (JSC::GetByIdStatus::computeForStubInfoWithoutExitSiteFeedback):
+ * bytecode/InByIdStatus.cpp:
+ * bytecode/PutByIdStatus.cpp:
+ (JSC::PutByIdStatus::computeForStubInfo):
+
2018-07-22 Yusuke Suzuki <[email protected]>
[JSC] GetByIdVariant and InByIdVariant do not need slot base if they are not "hit" variants
Modified: trunk/Source/_javascript_Core/bytecode/CallLinkStatus.cpp (234096 => 234097)
--- trunk/Source/_javascript_Core/bytecode/CallLinkStatus.cpp 2018-07-23 14:12:37 UTC (rev 234096)
+++ trunk/Source/_javascript_Core/bytecode/CallLinkStatus.cpp 2018-07-23 16:13:40 UTC (rev 234097)
@@ -85,6 +85,7 @@
UNUSED_PARAM(profiledBlock);
UNUSED_PARAM(bytecodeIndex);
UNUSED_PARAM(map);
+ UNUSED_PARAM(exitSiteData);
#if ENABLE(DFG_JIT)
CallLinkInfo* callLinkInfo = map.get(CodeOrigin(bytecodeIndex)).callLinkInfo;
if (!callLinkInfo) {
@@ -263,7 +264,6 @@
result.accountForExits(exitSiteData, inlineKind);
return result;
}
-#endif
void CallLinkStatus::accountForExits(ExitSiteData exitSiteData, ExitingInlineKind inlineKind)
{
@@ -382,6 +382,7 @@
return computeFor(profiledBlock, codeOrigin.bytecodeIndex, baselineMap, exitSiteData);
}
+#endif
void CallLinkStatus::setProvenConstantCallee(CallVariant variant)
{
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (234096 => 234097)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2018-07-23 14:12:37 UTC (rev 234096)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2018-07-23 16:13:40 UTC (rev 234097)
@@ -1415,10 +1415,12 @@
finalizeBaselineJITInlineCaches();
#endif
+#if ENABLE(DFG_JIT)
if (JITCode::isOptimizingJIT(jitType())) {
DFG::CommonData* dfgCommon = m_jitCode->dfgCommon();
dfgCommon->recordedStatuses.finalize();
}
+#endif // ENABLE(DFG_JIT)
VM::SpaceAndFinalizerSet::finalizerSetFor(*subspace()).remove(this);
}
Modified: trunk/Source/_javascript_Core/bytecode/GetByIdStatus.cpp (234096 => 234097)
--- trunk/Source/_javascript_Core/bytecode/GetByIdStatus.cpp 2018-07-23 14:12:37 UTC (rev 234096)
+++ trunk/Source/_javascript_Core/bytecode/GetByIdStatus.cpp 2018-07-23 16:13:40 UTC (rev 234097)
@@ -110,6 +110,8 @@
return result.slowVersion();
#else
UNUSED_PARAM(map);
+ UNUSED_PARAM(didExit);
+ UNUSED_PARAM(callExitSiteData);
#endif
if (!result)
@@ -288,7 +290,6 @@
RELEASE_ASSERT_NOT_REACHED();
return GetByIdStatus();
}
-#endif // ENABLE(JIT)
GetByIdStatus GetByIdStatus::computeFor(
CodeBlock* profiledBlock, ICStatusMap& baselineMap,
@@ -375,6 +376,7 @@
return result;
}
+#endif // ENABLE(JIT)
bool GetByIdStatus::makesCalls() const
{
Modified: trunk/Source/_javascript_Core/bytecode/InByIdStatus.cpp (234096 => 234097)
--- trunk/Source/_javascript_Core/bytecode/InByIdStatus.cpp 2018-07-23 14:12:37 UTC (rev 234096)
+++ trunk/Source/_javascript_Core/bytecode/InByIdStatus.cpp 2018-07-23 16:13:40 UTC (rev 234097)
@@ -42,6 +42,7 @@
return appendICStatusVariant(m_variants, variant);
}
+#if ENABLE(JIT)
InByIdStatus InByIdStatus::computeFor(CodeBlock* profiledBlock, ICStatusMap& map, unsigned bytecodeIndex, UniquedStringImpl* uid, ExitFlag didExit)
{
ConcurrentJSLocker locker(profiledBlock->m_lock);
@@ -104,6 +105,7 @@
return computeFor(profiledBlock, baselineMap, codeOrigin.bytecodeIndex, uid, didExit);
}
+#endif // ENABLE(JIT)
#if ENABLE(DFG_JIT)
InByIdStatus InByIdStatus::computeForStubInfo(const ConcurrentJSLocker& locker, CodeBlock* profiledBlock, StructureStubInfo* stubInfo, CodeOrigin codeOrigin, UniquedStringImpl* uid)
Modified: trunk/Source/_javascript_Core/bytecode/PutByIdStatus.cpp (234096 => 234097)
--- trunk/Source/_javascript_Core/bytecode/PutByIdStatus.cpp 2018-07-23 14:12:37 UTC (rev 234096)
+++ trunk/Source/_javascript_Core/bytecode/PutByIdStatus.cpp 2018-07-23 16:13:40 UTC (rev 234097)
@@ -99,6 +99,7 @@
structure, newStructure, conditionSet, offset, newStructure->inferredTypeDescriptorFor(uid));
}
+#if ENABLE(JIT)
PutByIdStatus PutByIdStatus::computeFor(CodeBlock* profiledBlock, ICStatusMap& map, unsigned bytecodeIndex, UniquedStringImpl* uid, ExitFlag didExit, CallLinkStatus::ExitSiteData callExitSiteData)
{
ConcurrentJSLocker locker(profiledBlock->m_lock);
@@ -123,7 +124,6 @@
#endif // ENABLE(JIT)
}
-#if ENABLE(JIT)
PutByIdStatus PutByIdStatus::computeForStubInfo(const ConcurrentJSLocker& locker, CodeBlock* baselineBlock, StructureStubInfo* stubInfo, CodeOrigin codeOrigin, UniquedStringImpl* uid)
{
return computeForStubInfo(
@@ -241,7 +241,6 @@
return PutByIdStatus(JSC::slowVersion(summary));
}
}
-#endif
PutByIdStatus PutByIdStatus::computeFor(CodeBlock* baselineBlock, ICStatusMap& baselineMap, ICStatusContextStack& contextStack, CodeOrigin codeOrigin, UniquedStringImpl* uid)
{
@@ -366,6 +365,7 @@
return result;
}
+#endif
bool PutByIdStatus::makesCalls() const
{
