Changeset 276005 in webkit for trunk/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp

Timestamp:

Apr 15, 2021, 12:03:38 AM (4 years ago)

Author:

[email protected]

Message:

[JSC] Change Vector<> to FixedVector<> in DFG::CommonData if possible
​https://bugs.webkit.org/show_bug.cgi?id=224588

Reviewed by Mark Lam.

DFG::CommonData is kept alive so long as DFG code exists. It includes a lot of Vectors while they are not mutable after the DFG code compilation.
This patch changes Vector<> to FixedVector<> if possible to shrink sizeof(DFG::CommonData). And this also removes the need of calling shrinkToFit
explicitly for them.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::propagateTransitions):
(JSC::CodeBlock::determineLiveness):
(JSC::CodeBlock::stronglyVisitWeakReferences):
(JSC::CodeBlock::jettison):
(JSC::CodeBlock::numberOfDFGIdentifiers const):
(JSC::CodeBlock::identifier const):

• bytecode/CodeBlock.h:
• dfg/DFGCommonData.cpp:

(JSC::DFG::CommonData::shrinkToFit):
(JSC::DFG::CommonData::invalidate):
(JSC::DFG::CommonData::~CommonData):
(JSC::DFG::CommonData::installVMTrapBreakpoints):
(JSC::DFG::CommonData::isVMTrapBreakpoint):
(JSC::DFG::CommonData::finalizeCatchEntrypoints):
(JSC::DFG::CommonData::notifyCompilingStructureTransition): Deleted.

• dfg/DFGCommonData.h:

(JSC::DFG::CommonData::catchOSREntryDataForBytecodeIndex):
(JSC::DFG::CommonData::appendCatchEntrypoint): Deleted.

• dfg/DFGDesiredIdentifiers.cpp:

(JSC::DFG::DesiredIdentifiers::reallyAdd):

• dfg/DFGDesiredTransitions.cpp:

(JSC::DFG::DesiredTransition::DesiredTransition):
(JSC::DFG::DesiredTransitions::DesiredTransitions):
(JSC::DFG::DesiredTransitions::addLazily):
(JSC::DFG::DesiredTransitions::reallyAdd):
(JSC::DFG::DesiredTransition::reallyAdd): Deleted.

• dfg/DFGDesiredTransitions.h:
• dfg/DFGDesiredWeakReferences.cpp:

(JSC::DFG::DesiredWeakReferences::reallyAdd):

• dfg/DFGGraph.h:
• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::link):
(JSC::DFG::JITCompiler::noticeCatchEntrypoint):

• dfg/DFGOSREntry.h:
• dfg/DFGPlan.cpp:

(JSC::DFG::Plan::Plan):
(JSC::DFG::Plan::finalizeWithoutNotifyingCallback):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::linkOSREntries):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• ftl/FTLCompile.cpp:

(JSC::FTL::compile):

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::compilePutStructure):
(JSC::FTL::DFG::LowerDFGToB3::compileMultiPutByOffset):
(JSC::FTL::DFG::LowerDFGToB3::compileInvalidationPoint):

File:

• trunk/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp

@@ -36 +36 @@
 namespace JSC { namespace DFG {
 
-DesiredTransition::DesiredTransition(CodeBlock* codeBlock, CodeBlock* codeOriginOwner, Structure* oldStructure, Structure* newStructure)
-    : m_codeBlock(codeBlock)
-    , m_codeOriginOwner(codeOriginOwner)
+DesiredTransition::DesiredTransition(CodeBlock* codeOriginOwner, Structure* oldStructure, Structure* newStructure)
+    : m_codeOriginOwner(codeOriginOwner)
     , m_oldStructure(oldStructure)
     , m_newStructure(newStructure)
 {
-}
-
-void DesiredTransition::reallyAdd(VM& vm, CommonData* common)
-{
-    ConcurrentJSLocker locker(m_codeBlock->m_lock);
-    common->transitions.append(
-        WeakReferenceTransition(
-            vm, m_codeBlock,
-            m_codeOriginOwner,
-            m_oldStructure, m_newStructure));
 }
 
@@ -65 +54 @@
 template void DesiredTransition::visitChildren(SlotVisitor&);
 
-DesiredTransitions::DesiredTransitions()
+DesiredTransitions::DesiredTransitions(CodeBlock* codeBlock)
+    : m_codeBlock(codeBlock)
 {
 }
@@ -73 +63 @@
 }
 
-void DesiredTransitions::addLazily(CodeBlock* codeBlock, CodeBlock* codeOriginOwner, Structure* oldStructure, Structure* newStructure)
+void DesiredTransitions::addLazily(CodeBlock* codeOriginOwner, Structure* oldStructure, Structure* newStructure)
 {
-    m_transitions.append(DesiredTransition(codeBlock, codeOriginOwner, oldStructure, newStructure));
+    m_transitions.append(DesiredTransition(codeOriginOwner, oldStructure, newStructure));
 }
 
 void DesiredTransitions::reallyAdd(VM& vm, CommonData* common)
 {
-    for (unsigned i = 0; i < m_transitions.size(); i++)
-        m_transitions[i].reallyAdd(vm, common);
+    FixedVector<WeakReferenceTransition> transitions(m_transitions.size());
+    for (unsigned i = 0; i < m_transitions.size(); i++) {
+        auto& desiredTransition = m_transitions[i];
+        transitions[i] = WeakReferenceTransition(vm, m_codeBlock, desiredTransition.m_codeOriginOwner, desiredTransition.m_oldStructure, desiredTransition.m_newStructure);
+    }
+    if (!transitions.isEmpty()) {
+        ConcurrentJSLocker locker(m_codeBlock->m_lock);
+        ASSERT(common->m_transitions.isEmpty());
+        common->m_transitions = WTFMove(transitions);
+    }
 }