Attachment 371624 Details for Bug 198023 – Patch

[patch] Patch

bug-198023-20190607161448.patch (text/plain), 28.00 KB, created by Yusuke Suzuki on 2019-06-07 16:14:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2019-06-07 16:14:49 PDT

Size: 28.00 KB

patch

obsolete

>Subversion Revision: 246084
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 521baaaa39e8ed45945f2be0f4398681e8473d70..ebe853f983db7aa73a589233478beb18c78ed89d 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,100 @@
>+2019-06-07  Yusuke Suzuki  <ysuzuki@apple.com>
>+
>+        [JSC] UnlinkedCodeBlock should be eventually jettisoned in VM mini mode
>+        https://bugs.webkit.org/show_bug.cgi?id=198023
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        While CodeBlock is periodically jettisoned, UnlinkedCodeBlock and UnlinkedFunctionExecutable can be retained almost forever in certain type of applications.
>+        When we execute a program, which has UnlinkedProgramCodeBlock retained in CodeCache. And UnlinkedProgramCodeBlock holds array of UnlinkedFunctionExecutable.
>+        And UnlinkedFunctionExecutables hold UnlinkedFunctionCodeBlocks once it is generated. So eventually, this tree gets larger and larger until we purge
>+        UnlinkedProgramCodeBlock from CodeCache. This is OK in the browser case. We navigate to various other pages, and UnlinkedProgramCodeBlocks should eventually
>+        be pruned from CodeCache with the new ones. So this tree won't be retained forever. But the behavior is different in the other applications that do not have
>+        navigations. If they only have one program which holds all, we basically retain this tree during executing this application. The same thing can happen in
>+        web applications which does not have navigation and keeps alive for a long time. Once we hit CodeCache limit by periodically executing a new script, we will
>+        hit the uppermost of memory footprint. But until that, we increase our memory footprint.
>+
>+        However, destroying these UnlinkedCodeBlocks and UnlinkedFunctionExecutables causes a tricky problem. In the browser environment, navigation can happen at any
>+        time. So even if the given UnlinkedCodeBlock seems unused in the current page, it can be used when navigating to a new page which is under the same domain.
>+        One example is initializing function in a script. It is only executed once per page. So once it is executed, it seems that this UnlinkedCodeBlock is unused.
>+        But this will be used when we navigate to a new page. Pruning code blocks based on usage could cause performance regression.
>+
>+        But if our VM is mini VM mode, the story is different. In mini VM mode, we focus on memory footprint rather than performance e.g. daemons. The daemon never
>+        reuse these CodeCache since we do not have the navigation.
>+
>+        This patch logically makes UnlinkedFunctionExecutable -> UnlinkedCodeBlock reference weak when VM is mini mode. If UnlinkedCodeBlock is used in previous GC
>+        cycle, we retain it. But if it is not used, and if UnlinkedFunctionExecutable is only the cell keeping UnlinkedCodeBlock alive, we destroy it. It is a
>+        heuristic. In a super pathological case, it could increase memory footprint. Consider the following example.
>+
>+            UnlinkedFunctionExecutable(A1) -> UnlinkedCodeBlock(B1) -> UnlinkedFunctionExecutable(C1) -> UnlinkedCodeBlock(D1)
>+                                                                                                             ^
>+                                                                                                         CodeBlock(E1)
>+
>+        We could delete A1, B1, and C1 while keeping D1. But if we eventually re-execute the same code corresponding to A1, B1, C1, they will be newly created, and
>+        we will create duplicate UnlinkedCodeBlock and instructions stream for D1.
>+
>+                                                                                                         UnlinkedCodeBlock(D1)
>+                                                                                                             ^
>+                                                                                                         CodeBlock(E1)
>+
>+            UnlinkedFunctionExecutable(A2) -> UnlinkedCodeBlock(B2) -> UnlinkedFunctionExecutable(C2) -> UnlinkedCodeBlock(D2)
>+
>+        But this does not happen in practice and even it happens, we eventually discard D1 and D2 since CodeBlock E1 will be jettisoned anyway. So in practice, we do
>+        not see memory footprint increase. We tested it in Gmail and the target application, but both said memory footprint reduction (30 MB / 400 MB and 1 MB /6 MB).
>+        While this affects on performance much on tests which has navigation (1-3 % regression in Speedometer2, note that JetStream2 does not show regression in x64,
>+        while it is not enabling mini mode), we do not apply this to non mini mode VM until we come up with a good strategy to fasten performance of re-generation.
>+        Personally I think flushing destroyed UnlinkedCodeBlock to the disk sounds promising.
>+
>+        If UnlinkedCodeBlock is generated from bytecode cache, we do not make UnlinkedFunctionExecutable -> UnlinkedCodeBlock link weak because the decoder of the bytecode
>+        cache assumes that generated JSCells won't be destroyed while the parent cells of that cell are live. This is true in the current implementation, and this assumption
>+        will be broken with this patch. So, for now, we do not make this link weak. Currently, our target application does not use bytecode cache so it is OK.
>+
>+        This patch also introduce simple heuristic too. We are counting UnlinkedCodeBlock's age. And once the age becomes maximum size, we make UnlinkedFunctionExecutable ->
>+        UnlinkedCodeBlock link weak. We also use execution counter information to reset this age: CodeBlock will reset undelying UnlinkedCodeBlock's age if it has some
>+        execution. While this heuristic is quite simple, it has some effect in practice. Basically what happens with this heuristic is that UnlinkedFunctionExecutable ->
>+        UnlinkedCodeBlock link strong. When GC happens, we are executing some CodeBlocks, which become live. And ScriptExecutables -> UnlinkedFunctionExecutables held
>+        by this CodeBlock become also live. Then UnlinkedFunctionExecutables can mark the child UnlinkedCodeBlocks if it is not so old.
>+        If some of parent UnlinkedFunctionExecutable becomes dead, child UnlinkedCodeBlocks tends to be dead unless some live CodeBlock holds it. But it is OK for a first
>+        heuristics since this means that parent code block is now considered old, reachable UnlinkedCodeBlock will be used when the parent is executed again. So destroying
>+        the tree is OK even if the tree may include some new UnlinkedCodeBlock. While we could make more sophisticated mechanism to manage these lifetime, I think this is a
>+        good starting point.
>+
>+        Based on measurement, we pick 7 as a maximum age. If we pick 0, we can get more memory reduction (1 - 1.5 MB!), while we ends up reparsing codes so many times.
>+        It seems that 7 can reduce fair amount of memory while doing small # of reparsing on average (usually, 1, 2. Sometimes, 100. But not 300, which is the case in 0).
>+        If we want to get more memory reduction for the sake of performance, we could decrease this age limit.
>+
>+        Since we do not have an automated script right now so it is a bit difficult to measure memory footprint precisely. But manual testing shows that this patch improves
>+        memory footprint of our target application from about 6.5 MB to about 5.9 MB.
>+
>+        * bytecode/CodeBlock.cpp:
>+        (JSC::CodeBlock::finalizeUnconditionally):
>+        * bytecode/CodeBlock.h:
>+        * bytecode/UnlinkedCodeBlock.cpp:
>+        (JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
>+        (JSC::UnlinkedCodeBlock::visitChildren):
>+        * bytecode/UnlinkedCodeBlock.h:
>+        (JSC::UnlinkedCodeBlock::age const):
>+        (JSC::UnlinkedCodeBlock::resetAge):
>+        * bytecode/UnlinkedFunctionExecutable.cpp:
>+        (JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
>+        (JSC::UnlinkedFunctionExecutable::visitChildren):
>+        (JSC::UnlinkedFunctionExecutable::unlinkedCodeBlockFor):
>+        (JSC::UnlinkedFunctionExecutable::decodeCachedCodeBlocks):
>+        (JSC::UnlinkedFunctionExecutable::finalizeUnconditionally):
>+        * bytecode/UnlinkedFunctionExecutable.h:
>+        * heap/Heap.cpp:
>+        (JSC::Heap::finalizeUnconditionalFinalizers):
>+        * runtime/CachedTypes.cpp:
>+        (JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
>+        (JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
>+        * runtime/CodeSpecializationKind.h:
>+        * runtime/Options.h:
>+        * runtime/VM.cpp:
>+        (JSC::VM::isInMiniMode): Deleted.
>+        * runtime/VM.h:
>+        (JSC::VM::isInMiniMode):
>+        (JSC::VM::useUnlinkedCodeBlockJettisoning):
>+
> 2019-06-04  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         Unreviewed, update exception scope for putByIndexBeyondVectorLength
>diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
>index ade2ace3d1a46d1316a043d31058201001770d50..bf75ab0b56cc0dbe0c9668bcda04be1dacaa2d3e 100644
>--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
>+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
>@@ -1373,6 +1373,35 @@ void CodeBlock::finalizeUnconditionally(VM& vm)
>     }
> #endif // ENABLE(DFG_JIT)
> 
>+    auto updateActivity = [&] {
>+        if (!VM::isInMiniMode())
>+            return;
>+        JITCode* jitCode = m_jitCode.get();
>+        double count = 0;
>+        bool alwaysActive = false;
>+        switch (JITCode::jitTypeFor(jitCode)) {
>+        case JITType::None:
>+        case JITType::HostCallThunk:
>+            return;
>+        case JITType::InterpreterThunk:
>+            count = m_llintExecuteCounter.count();
>+            break;
>+        case JITType::BaselineJIT:
>+            count = m_jitExecuteCounter.count();
>+            break;
>+        case JITType::DFGJIT:
>+        case JITType::FTLJIT:
>+            alwaysActive = true;
>+            break;
>+        }
>+        if (alwaysActive || m_previousCounter < count) {
>+            // CodeBlock is active right now, so resetting UnlinkedCodeBlock's age.
>+            m_unlinkedCode->resetAge();
>+        }
>+        m_previousCounter = count;
>+    };
>+    updateActivity();
>+
>     VM::SpaceAndSet::setFor(*subspace()).remove(this);
> }
> 
>diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.h b/Source/JavaScriptCore/bytecode/CodeBlock.h
>index 4e62bdec22ee9e5e286f9165404b0fc32d77c289..4d3279ecc92b4d279cbc8849ab8858808e97c556 100644
>--- a/Source/JavaScriptCore/bytecode/CodeBlock.h
>+++ b/Source/JavaScriptCore/bytecode/CodeBlock.h
>@@ -1010,6 +1010,7 @@ class CodeBlock : public JSCell {
>     RefPtr<MetadataTable> m_metadata;
> 
>     MonotonicTime m_creationTime;
>+    double m_previousCounter { 0 };
> 
>     std::unique_ptr<RareData> m_rareData;
> };
>diff --git a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp
>index f9c3ba9d71647d423db18a14419804d34f30f441..7745a41ad2b3a1fabcad4248c1e5e74864ed0dac 100644
>--- a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp
>+++ b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp
>@@ -71,6 +71,7 @@ UnlinkedCodeBlock::UnlinkedCodeBlock(VM* vm, Structure* structure, CodeType code
>     , m_evalContextType(static_cast<unsigned>(info.evalContextType()))
>     , m_codeType(static_cast<unsigned>(codeType))
>     , m_didOptimize(static_cast<unsigned>(MixedTriState))
>+    , m_age(0)
>     , m_parseMode(info.parseMode())
>     , m_codeGenerationMode(codeGenerationMode)
>     , m_metadata(UnlinkedMetadataTable::create())
>@@ -88,6 +89,7 @@ void UnlinkedCodeBlock::visitChildren(JSCell* cell, SlotVisitor& visitor)
>     ASSERT_GC_OBJECT_INHERITS(thisObject, info());
>     Base::visitChildren(thisObject, visitor);
>     auto locker = holdLock(thisObject->cellLock());
>+    thisObject->m_age = std::min<unsigned>(static_cast<unsigned>(thisObject->m_age) + 1, maxAge);
>     for (FunctionExpressionVector::iterator ptr = thisObject->m_functionDecls.begin(), end = thisObject->m_functionDecls.end(); ptr != end; ++ptr)
>         visitor.append(*ptr);
>     for (FunctionExpressionVector::iterator ptr = thisObject->m_functionExprs.begin(), end = thisObject->m_functionExprs.end(); ptr != end; ++ptr)
>diff --git a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h
>index 2a350a1f11cf2131f72c2b4bd809018fe712eff2..c18a70d2a92f9ef86b44d8f8818318ad9da2fbd9 100644
>--- a/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h
>+++ b/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h
>@@ -339,6 +339,11 @@ class UnlinkedCodeBlock : public JSCell {
>     TriState didOptimize() const { return static_cast<TriState>(m_didOptimize); }
>     void setDidOptimize(TriState didOptimize) { m_didOptimize = static_cast<unsigned>(didOptimize); }
> 
>+    static constexpr unsigned maxAge = 7;
>+
>+    unsigned age() const { return m_age; }
>+    void resetAge() { m_age = 0; }
>+
>     void dump(PrintStream&) const;
> 
>     BytecodeLivenessAnalysis& livenessAnalysis(CodeBlock* codeBlock)
>@@ -424,6 +429,7 @@ class UnlinkedCodeBlock : public JSCell {
>     unsigned m_evalContextType : 2;
>     unsigned m_codeType : 2;
>     unsigned m_didOptimize : 2;
>+    unsigned m_age : 3;
> public:
>     ConcurrentJSLock m_lock;
> private:
>diff --git a/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp b/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp
>index 14a069c5e07608d309182293656eb2187fd97fd6..10cf4f64e4b2af3eddecc2f5c119b7af7b81b07c 100644
>--- a/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp
>+++ b/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp
>@@ -107,6 +107,7 @@ UnlinkedFunctionExecutable::UnlinkedFunctionExecutable(VM* vm, Structure* struct
>     , m_constructorKind(static_cast<unsigned>(node->constructorKind()))
>     , m_functionMode(static_cast<unsigned>(node->functionMode()))
>     , m_derivedContextType(static_cast<unsigned>(derivedContextType))
>+    , m_isGeneratedFromCache(false)
>     , m_unlinkedCodeBlockForCall()
>     , m_unlinkedCodeBlockForConstruct()
>     , m_name(node->ident())
>@@ -142,7 +143,24 @@ void UnlinkedFunctionExecutable::visitChildren(JSCell* cell, SlotVisitor& visito
>     UnlinkedFunctionExecutable* thisObject = jsCast<UnlinkedFunctionExecutable*>(cell);
>     ASSERT_GC_OBJECT_INHERITS(thisObject, info());
>     Base::visitChildren(thisObject, visitor);
>-    if (!thisObject->m_isCached) {
>+
>+    // Currently, bytecode cache assumes that the tree of UnlinkedFunctionExecutable and UnlinkedCodeBlock will not be destroyed while the parent is live.
>+    // Bytecode cache uses this asumption to avoid duplicate materialization by bookkeeping the heap cells in the offste-to-pointer map.
>+    //
>+    // We also keep builtin functions. The builtin functions are foundamental library for JavaScript, which means that they can be used in random places of
>+    // the client scripts. It is safe to assume that builtin functions are used relatively frequently from many call sites.
>+    if (VM::useUnlinkedCodeBlockJettisoning() && !thisObject->m_isGeneratedFromCache && !thisObject->isBuiltinFunction()) {
>+        auto markIfProfitable = [&] (WriteBarrier<UnlinkedFunctionCodeBlock>& unlinkedCodeBlock) {
>+            if (!unlinkedCodeBlock)
>+                return;
>+            if (unlinkedCodeBlock->didOptimize() == TrueTriState)
>+                visitor.append(unlinkedCodeBlock);
>+            else if (unlinkedCodeBlock->age() < UnlinkedCodeBlock::maxAge)
>+                visitor.append(unlinkedCodeBlock);
>+        };
>+        markIfProfitable(thisObject->m_unlinkedCodeBlockForCall);
>+        markIfProfitable(thisObject->m_unlinkedCodeBlockForConstruct);
>+    } else if (!thisObject->m_isCached) {
>         visitor.append(thisObject->m_unlinkedCodeBlockForCall);
>         visitor.append(thisObject->m_unlinkedCodeBlockForConstruct);
>     }
>@@ -197,24 +215,12 @@ UnlinkedFunctionExecutable* UnlinkedFunctionExecutable::fromGlobalCode(
>     return executable;
> }
> 
>-UnlinkedFunctionCodeBlock* UnlinkedFunctionExecutable::unlinkedCodeBlockFor(CodeSpecializationKind specializationKind)
>-{
>-    switch (specializationKind) {
>-    case CodeForCall:
>-        return m_unlinkedCodeBlockForCall.get();
>-    case CodeForConstruct:
>-        return m_unlinkedCodeBlockForConstruct.get();
>-    }
>-    ASSERT_NOT_REACHED();
>-    return nullptr;
>-}
>-
> UnlinkedFunctionCodeBlock* UnlinkedFunctionExecutable::unlinkedCodeBlockFor(
>     VM& vm, const SourceCode& source, CodeSpecializationKind specializationKind, 
>     OptionSet<CodeGenerationMode> codeGenerationMode, ParserError& error, SourceParseMode parseMode)
> {
>     if (m_isCached)
>-        decodeCachedCodeBlocks();
>+        decodeCachedCodeBlocks(vm);
>     switch (specializationKind) {
>     case CodeForCall:
>         if (UnlinkedFunctionCodeBlock* codeBlock = m_unlinkedCodeBlockForCall.get())
>@@ -246,7 +252,7 @@ UnlinkedFunctionCodeBlock* UnlinkedFunctionExecutable::unlinkedCodeBlockFor(
>     return result;
> }
> 
>-void UnlinkedFunctionExecutable::decodeCachedCodeBlocks()
>+void UnlinkedFunctionExecutable::decodeCachedCodeBlocks(VM& vm)
> {
>     ASSERT(m_isCached);
>     ASSERT(m_decoder);
>@@ -256,7 +262,7 @@ void UnlinkedFunctionExecutable::decodeCachedCodeBlocks()
>     int32_t cachedCodeBlockForCallOffset = m_cachedCodeBlockForCallOffset;
>     int32_t cachedCodeBlockForConstructOffset = m_cachedCodeBlockForConstructOffset;
> 
>-    DeferGC deferGC(decoder->vm().heap);
>+    DeferGC deferGC(vm.heap);
> 
>     // No need to clear m_unlinkedCodeBlockForCall here, since we moved the decoder out of the same slot
>     if (cachedCodeBlockForCallOffset)
>@@ -268,7 +274,7 @@ void UnlinkedFunctionExecutable::decodeCachedCodeBlocks()
> 
>     WTF::storeStoreFence();
>     m_isCached = false;
>-    decoder->vm().heap.writeBarrier(this);
>+    vm.heap.writeBarrier(this);
> }
> 
> UnlinkedFunctionExecutable::RareData& UnlinkedFunctionExecutable::ensureRareDataSlow()
>@@ -284,4 +290,25 @@ void UnlinkedFunctionExecutable::setInvalidTypeProfilingOffsets()
>     m_typeProfilingEndOffset = std::numeric_limits<unsigned>::max();
> }
> 
>+void UnlinkedFunctionExecutable::finalizeUnconditionally(VM& vm)
>+{
>+    if (VM::useUnlinkedCodeBlockJettisoning() && !m_isGeneratedFromCache && !isBuiltinFunction()) {
>+        bool isCleared = false;
>+        bool isStillValid = false;
>+        auto clearIfDead = [&] (WriteBarrier<UnlinkedFunctionCodeBlock>& unlinkedCodeBlock) {
>+            if (!unlinkedCodeBlock)
>+                return;
>+            if (!vm.heap.isMarked(unlinkedCodeBlock.get())) {
>+                unlinkedCodeBlock.clear();
>+                isCleared = true;
>+            } else
>+                isStillValid = true;
>+        };
>+        clearIfDead(m_unlinkedCodeBlockForCall);
>+        clearIfDead(m_unlinkedCodeBlockForConstruct);
>+        if (isCleared && !isStillValid)
>+            vm.unlinkedFunctionExecutableSpace.set.remove(this);
>+    }
>+}
>+
> } // namespace JSC
>diff --git a/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h b/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h
>index 0c7f89cd4eb024fcf80d78836c3f43c0a7cd23c3..bed95d309e7f16dcd69792ffed44a0d1e2dc8f11 100644
>--- a/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h
>+++ b/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h
>@@ -114,8 +114,6 @@ class UnlinkedFunctionExecutable final : public JSCell {
>     unsigned typeProfilingEndOffset() const { return m_typeProfilingEndOffset; }
>     void setInvalidTypeProfilingOffsets();
> 
>-    UnlinkedFunctionCodeBlock* unlinkedCodeBlockFor(CodeSpecializationKind);
>-
>     UnlinkedFunctionCodeBlock* unlinkedCodeBlockFor(
>         VM&, const SourceCode&, CodeSpecializationKind, OptionSet<CodeGenerationMode>,
>         ParserError&, SourceParseMode);
>@@ -189,6 +187,8 @@ class UnlinkedFunctionExecutable final : public JSCell {
>         ensureRareData().m_sourceMappingURLDirective = sourceMappingURL;
>     }
> 
>+    void finalizeUnconditionally(VM&);
>+
>     struct RareData {
>         WTF_MAKE_STRUCT_FAST_ALLOCATED;
> 
>@@ -202,7 +202,7 @@ class UnlinkedFunctionExecutable final : public JSCell {
>     UnlinkedFunctionExecutable(VM*, Structure*, const SourceCode&, FunctionMetadataNode*, UnlinkedFunctionKind, ConstructAbility, JSParserScriptMode, Optional<CompactVariableMap::Handle>,  JSC::DerivedContextType, bool isBuiltinDefaultClassConstructor);
>     UnlinkedFunctionExecutable(Decoder&, const CachedFunctionExecutable&);
> 
>-    void decodeCachedCodeBlocks();
>+    void decodeCachedCodeBlocks(VM&);
> 
>     unsigned m_firstLineOffset : 31;
>     unsigned m_isInStrictContext : 1;
>@@ -228,6 +228,7 @@ class UnlinkedFunctionExecutable final : public JSCell {
>     unsigned m_constructorKind : 2;
>     unsigned m_functionMode : 2; // FunctionMode
>     unsigned m_derivedContextType: 2;
>+    unsigned m_isGeneratedFromCache : 1;
> 
>     union {
>         WriteBarrier<UnlinkedFunctionCodeBlock> m_unlinkedCodeBlockForCall;
>diff --git a/Source/JavaScriptCore/heap/Heap.cpp b/Source/JavaScriptCore/heap/Heap.cpp
>index 6663b4f0d39ebbef9d270de03d2b5fc5e33d6482..a85207f12cf603f047881d164cc678274483ffee 100644
>--- a/Source/JavaScriptCore/heap/Heap.cpp
>+++ b/Source/JavaScriptCore/heap/Heap.cpp
>@@ -606,6 +606,7 @@ void Heap::finalizeUnconditionalFinalizers()
>         });
>     finalizeMarkedUnconditionalFinalizers<ExecutableToCodeBlockEdge>(vm()->executableToCodeBlockEdgesWithFinalizers);
>     finalizeMarkedUnconditionalFinalizers<StructureRareData>(vm()->structureRareDataSpace);
>+    finalizeMarkedUnconditionalFinalizers<UnlinkedFunctionExecutable>(vm()->unlinkedFunctionExecutableSpace.set);
>     if (vm()->m_weakSetSpace)
>         finalizeMarkedUnconditionalFinalizers<JSWeakSet>(*vm()->m_weakSetSpace);
>     if (vm()->m_weakMapSpace)
>diff --git a/Source/JavaScriptCore/runtime/CachedTypes.cpp b/Source/JavaScriptCore/runtime/CachedTypes.cpp
>index d461e569329f1d9e8b86ecbc357b9ae7699d718a..03cf164fbccc011e8c85f017772408b1c1154ebb 100644
>--- a/Source/JavaScriptCore/runtime/CachedTypes.cpp
>+++ b/Source/JavaScriptCore/runtime/CachedTypes.cpp
>@@ -2031,6 +2031,7 @@ ALWAYS_INLINE UnlinkedCodeBlock::UnlinkedCodeBlock(Decoder& decoder, Structure*
>     , m_codeType(cachedCodeBlock.codeType())
> 
>     , m_didOptimize(static_cast<unsigned>(MixedTriState))
>+    , m_age(0)
> 
>     , m_features(cachedCodeBlock.features())
>     , m_parseMode(cachedCodeBlock.parseMode())
>@@ -2158,6 +2159,7 @@ ALWAYS_INLINE UnlinkedFunctionExecutable::UnlinkedFunctionExecutable(Decoder& de
>     , m_constructorKind(cachedExecutable.constructorKind())
>     , m_functionMode(cachedExecutable.functionMode())
>     , m_derivedContextType(cachedExecutable.derivedContextType())
>+    , m_isGeneratedFromCache(true)
>     , m_unlinkedCodeBlockForCall()
>     , m_unlinkedCodeBlockForConstruct()
> 
>diff --git a/Source/JavaScriptCore/runtime/CodeSpecializationKind.h b/Source/JavaScriptCore/runtime/CodeSpecializationKind.h
>index 7500861fb59382a3b950180889a3b48daefb7be6..c757495bdc550433e0025ffcfaecf024d3ae4cb3 100644
>--- a/Source/JavaScriptCore/runtime/CodeSpecializationKind.h
>+++ b/Source/JavaScriptCore/runtime/CodeSpecializationKind.h
>@@ -27,7 +27,7 @@
> 
> namespace JSC {
> 
>-enum CodeSpecializationKind { CodeForCall, CodeForConstruct };
>+enum CodeSpecializationKind : uint8_t { CodeForCall, CodeForConstruct };
> 
> inline CodeSpecializationKind specializationFromIsCall(bool isCall)
> {
>diff --git a/Source/JavaScriptCore/runtime/Options.h b/Source/JavaScriptCore/runtime/Options.h
>index 14c9b5663e54c5ed59ea9ac6d6dcc059a8026126..c42a341fd8ddbb14fb3e6277562a45aa3d06da04 100644
>--- a/Source/JavaScriptCore/runtime/Options.h
>+++ b/Source/JavaScriptCore/runtime/Options.h
>@@ -520,6 +520,7 @@ constexpr bool enableWebAssemblyStreamingApi = false;
>     v(double, validateAbstractInterpreterStateProbability, 0.5, Normal, nullptr) \
>     v(optionString, dumpJITMemoryPath, nullptr, Restricted, nullptr) \
>     v(double, dumpJITMemoryFlushInterval, 10, Restricted, "Maximum time in between flushes of the JIT memory dump in seconds.") \
>+    v(bool, useUnlinkedCodeBlockJettisoning, false, Normal, "If true, UnlinkedCodeBlock can be jettisoned.") \
> 
> 
> enum OptionEquivalence {
>diff --git a/Source/JavaScriptCore/runtime/VM.cpp b/Source/JavaScriptCore/runtime/VM.cpp
>index 45fa20269215afeb7fa896575d65479fd3e70b8b..2861a12dc2ee398c5232f99fbb9c2e9860d4fbac 100644
>--- a/Source/JavaScriptCore/runtime/VM.cpp
>+++ b/Source/JavaScriptCore/runtime/VM.cpp
>@@ -232,11 +232,6 @@ void VM::computeCanUseJIT()
> #endif
> }
> 
>-bool VM::isInMiniMode()
>-{
>-    return !canUseJIT() || Options::forceMiniVMMode();
>-}
>-
> inline unsigned VM::nextID()
> {
>     for (;;) {
>diff --git a/Source/JavaScriptCore/runtime/VM.h b/Source/JavaScriptCore/runtime/VM.h
>index 11c87dfc74498f456e1f393a832625d260edefa1..eee155c4b297d9229dbaf3fdcc9ab27d9fb0a8a2 100644
>--- a/Source/JavaScriptCore/runtime/VM.h
>+++ b/Source/JavaScriptCore/runtime/VM.h
>@@ -632,7 +632,15 @@ class VM : public ThreadSafeRefCounted<VM>, public DoublyLinkedListNode<VM> {
>     };
> 
>     static JS_EXPORT_PRIVATE bool canUseAssembler();
>-    static JS_EXPORT_PRIVATE bool isInMiniMode();
>+    static bool isInMiniMode()
>+    {
>+        return !canUseJIT() || Options::forceMiniVMMode();
>+    }
>+
>+    static bool useUnlinkedCodeBlockJettisoning()
>+    {
>+        return Options::useUnlinkedCodeBlockJettisoning() || isInMiniMode();
>+    }
> 
>     static void computeCanUseJIT();
>     ALWAYS_INLINE static bool canUseJIT()
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 5c3ca1ed4c9b21a4f0df1ac41482ebb072812fa6..5b84e0e8413c03d012e77e9365f825e11188e866 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-06-07  Yusuke Suzuki  <ysuzuki@apple.com>
>+
>+        [JSC] UnlinkedCodeBlock should be eventually jettisoned in VM mini mode
>+        https://bugs.webkit.org/show_bug.cgi?id=198023
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/run-jsc-stress-tests:
>+
> 2019-06-04  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-app] Add authentication while fetching bugs
>diff --git a/Tools/Scripts/run-jsc-stress-tests b/Tools/Scripts/run-jsc-stress-tests
>index 123b7fd4ddc29fb925d3573bb29b8052b3e6dba1..a0336567976fe449cb894a8b21b0a6fcba321e40 100755
>--- a/Tools/Scripts/run-jsc-stress-tests
>+++ b/Tools/Scripts/run-jsc-stress-tests
>@@ -780,12 +780,17 @@ def runShadowChicken(*optionalTestSpecificOptions)
>     run("shadow-chicken", "--useDFGJIT=false", "--alwaysUseShadowChicken=true", *optionalTestSpecificOptions)
> end
> 
>+def runMiniMode(*optionalTestSpecificOptions)
>+    run("mini-mode", "--forceMiniVMMode=true", *optionalTestSpecificOptions)
>+end
>+
> def defaultRun
>     if $mode == "quick"
>         defaultQuickRun
>     else
>         runDefault
>         runBytecodeCache
>+        runMiniMode
>         if $jitTests
>             runNoLLInt
>             runNoCJITValidatePhases
>diff --git a/JSTests/ChangeLog b/JSTests/ChangeLog
>index 87b3b1924b383aab67020d4fc8998c2b00786810..6ec9b5f5d9e21ea88ae54d8985937ae15cbef48d 100644
>--- a/JSTests/ChangeLog
>+++ b/JSTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-07  Yusuke Suzuki  <ysuzuki@apple.com>
>+
>+        [JSC] UnlinkedCodeBlock should be eventually jettisoned in VM mini mode
>+        https://bugs.webkit.org/show_bug.cgi?id=198023
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * stress/reparsing-unlinked-codeblock.js: Added.
>+        (shouldBe):
>+        (hello):
>+
> 2019-06-04  Tadeu Zagallo  <tzagallo@apple.com>
> 
>         Argument elimination should check transitive dependents for interference
>diff --git a/JSTests/stress/reparsing-unlinked-codeblock.js b/JSTests/stress/reparsing-unlinked-codeblock.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..b319637fec70af60fc232b2e9b00cd88fb732859
>--- /dev/null
>+++ b/JSTests/stress/reparsing-unlinked-codeblock.js
>@@ -0,0 +1,24 @@
>+//@ runDefault("--forceCodeBlockToJettisonDueToOldAge=1", "--useUnlinkedCodeBlockJettisoning=1")
>+
>+function shouldBe(actual, expected) {
>+    if (actual !== expected)
>+        throw new Error('bad value: ' + actual);
>+}
>+
>+function hello()
>+{
>+    return (function () {
>+        function world() {
>+            return 42;
>+        };
>+        return world();
>+    }());
>+}
>+
>+// Compile hello and world function.
>+shouldBe(hello(), 42);
>+// Kick full GC 20 times to make UnlinkedCodeBlock aged and destroyed. Jettison hello CodeBlock, and underlying world UnlinkedCodeBlock.
>+for (var i = 0; i < 20; ++i)
>+    fullGC();
>+// Recompile world.
>+shouldBe(hello(), 42);

Flags:

saam: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 198023: 370283 | 371361 | 371455 | 371472 | 371473 | 371474 | 371560 | 371564 | 371569 | 371624