<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[285460] branches/safari-612-branch</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/285460">285460</a></dd>
<dt>Author</dt> <dd>kocsen_chung@apple.com</dd>
<dt>Date</dt> <dd>2021-11-08 17:09:00 -0800 (Mon, 08 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/283567">r283567</a>. rdar://problem/85173529

    CodeBlock should not add/remove LoopHintExecutionCounters.
    https://bugs.webkit.org/show_bug.cgi?id=231209
    rdar://83571235

    Reviewed by Saam Barati.

    JSTests:

    * stress/codeBlock-should-not-add-remove-loop-hint-execution-counters-due-to-cached-unlinked-baseline-code.js: Added.

    Source/JavaScriptCore:

    This is because cached unlinked baseline JIT code would retain a pointer to those
    counters.  Hence, the UnlinkedCodeBlock should do the add /remove of the counters
    instead.

    * bytecode/CodeBlock.cpp:
    (JSC::CodeBlock::finishCreation):
    (JSC::CodeBlock::~CodeBlock):
    * bytecode/UnlinkedCodeBlock.cpp:
    (JSC::UnlinkedCodeBlock::initializeLoopHintExecutionCounter):
    (JSC::UnlinkedCodeBlock::~UnlinkedCodeBlock):
    * bytecode/UnlinkedCodeBlock.h:
    * bytecode/UnlinkedCodeBlockGenerator.cpp:
    (JSC::UnlinkedCodeBlockGenerator::finalize):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283567 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchJSTestsChangeLog">branches/safari-612-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCoreChangeLog">branches/safari-612-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCorebytecodeCodeBlockcpp">branches/safari-612-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCorebytecodeUnlinkedCodeBlockGeneratorcpp">branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlockGenerator.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari612branchJSTestsstresscodeBlockshouldnotaddremoveloophintexecutioncountersduetocachedunlinkedbaselinecodejs">branches/safari-612-branch/JSTests/stress/codeBlock-should-not-add-remove-loop-hint-execution-counters-due-to-cached-unlinked-baseline-code.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/JSTests/ChangeLog (285459 => 285460)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/JSTests/ChangeLog     2021-11-09 01:08:57 UTC (rev 285459)
+++ branches/safari-612-branch/JSTests/ChangeLog        2021-11-09 01:09:00 UTC (rev 285460)
</span><span class="lines">@@ -1,5 +1,48 @@
</span><span class="cx"> 2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r283567. rdar://problem/85173529
+
+    CodeBlock should not add/remove LoopHintExecutionCounters.
+    https://bugs.webkit.org/show_bug.cgi?id=231209
+    rdar://83571235
+    
+    Reviewed by Saam Barati.
+    
+    JSTests:
+    
+    * stress/codeBlock-should-not-add-remove-loop-hint-execution-counters-due-to-cached-unlinked-baseline-code.js: Added.
+    
+    Source/JavaScriptCore:
+    
+    This is because cached unlinked baseline JIT code would retain a pointer to those
+    counters.  Hence, the UnlinkedCodeBlock should do the add /remove of the counters
+    instead.
+    
+    * bytecode/CodeBlock.cpp:
+    (JSC::CodeBlock::finishCreation):
+    (JSC::CodeBlock::~CodeBlock):
+    * bytecode/UnlinkedCodeBlock.cpp:
+    (JSC::UnlinkedCodeBlock::initializeLoopHintExecutionCounter):
+    (JSC::UnlinkedCodeBlock::~UnlinkedCodeBlock):
+    * bytecode/UnlinkedCodeBlock.h:
+    * bytecode/UnlinkedCodeBlockGenerator.cpp:
+    (JSC::UnlinkedCodeBlockGenerator::finalize):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283567 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-05  Mark Lam  <mark.lam@apple.com>
+
+            CodeBlock should not add/remove LoopHintExecutionCounters.
+            https://bugs.webkit.org/show_bug.cgi?id=231209
+            rdar://83571235
+
+            Reviewed by Saam Barati.
+
+            * stress/codeBlock-should-not-add-remove-loop-hint-execution-counters-due-to-cached-unlinked-baseline-code.js: Added.
+
+2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
+
</ins><span class="cx">         Cherry-pick r283332. rdar://problem/85173157
</span><span class="cx"> 
</span><span class="cx">     The DFG/FTL need to be aware that Proxy's can produce "function" for typeof and might be callable
</span></span></pre></div>
<a id="branchessafari612branchJSTestsstresscodeBlockshouldnotaddremoveloophintexecutioncountersduetocachedunlinkedbaselinecodejs"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/JSTests/stress/codeBlock-should-not-add-remove-loop-hint-execution-counters-due-to-cached-unlinked-baseline-code.js (0 => 285460)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/JSTests/stress/codeBlock-should-not-add-remove-loop-hint-execution-counters-due-to-cached-unlinked-baseline-code.js                           (rev 0)
+++ branches/safari-612-branch/JSTests/stress/codeBlock-should-not-add-remove-loop-hint-execution-counters-due-to-cached-unlinked-baseline-code.js      2021-11-09 01:09:00 UTC (rev 285460)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+//@ runDefault("--returnEarlyFromInfiniteLoopsForFuzzing=true", "--forceCodeBlockToJettisonDueToOldAge=true", "--collectContinuously=true")
+
+async function foo() {
+    for (let i = 0; i < 1000; i++);
+}
+
+for (let i = 0; i < 1000; i++) {
+   foo();
+   edenGC();
+}
</ins></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/ChangeLog (285459 => 285460)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/ChangeLog       2021-11-09 01:08:57 UTC (rev 285459)
+++ branches/safari-612-branch/Source/JavaScriptCore/ChangeLog  2021-11-09 01:09:00 UTC (rev 285460)
</span><span class="lines">@@ -1,5 +1,60 @@
</span><span class="cx"> 2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r283567. rdar://problem/85173529
+
+    CodeBlock should not add/remove LoopHintExecutionCounters.
+    https://bugs.webkit.org/show_bug.cgi?id=231209
+    rdar://83571235
+    
+    Reviewed by Saam Barati.
+    
+    JSTests:
+    
+    * stress/codeBlock-should-not-add-remove-loop-hint-execution-counters-due-to-cached-unlinked-baseline-code.js: Added.
+    
+    Source/JavaScriptCore:
+    
+    This is because cached unlinked baseline JIT code would retain a pointer to those
+    counters.  Hence, the UnlinkedCodeBlock should do the add /remove of the counters
+    instead.
+    
+    * bytecode/CodeBlock.cpp:
+    (JSC::CodeBlock::finishCreation):
+    (JSC::CodeBlock::~CodeBlock):
+    * bytecode/UnlinkedCodeBlock.cpp:
+    (JSC::UnlinkedCodeBlock::initializeLoopHintExecutionCounter):
+    (JSC::UnlinkedCodeBlock::~UnlinkedCodeBlock):
+    * bytecode/UnlinkedCodeBlock.h:
+    * bytecode/UnlinkedCodeBlockGenerator.cpp:
+    (JSC::UnlinkedCodeBlockGenerator::finalize):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283567 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-05  Mark Lam  <mark.lam@apple.com>
+
+            CodeBlock should not add/remove LoopHintExecutionCounters.
+            https://bugs.webkit.org/show_bug.cgi?id=231209
+            rdar://83571235
+
+            Reviewed by Saam Barati.
+
+            This is because cached unlinked baseline JIT code would retain a pointer to those
+            counters.  Hence, the UnlinkedCodeBlock should do the add /remove of the counters
+            instead.
+
+            * bytecode/CodeBlock.cpp:
+            (JSC::CodeBlock::finishCreation):
+            (JSC::CodeBlock::~CodeBlock):
+            * bytecode/UnlinkedCodeBlock.cpp:
+            (JSC::UnlinkedCodeBlock::initializeLoopHintExecutionCounter):
+            (JSC::UnlinkedCodeBlock::~UnlinkedCodeBlock):
+            * bytecode/UnlinkedCodeBlock.h:
+            * bytecode/UnlinkedCodeBlockGenerator.cpp:
+            (JSC::UnlinkedCodeBlockGenerator::finalize):
+
+2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
+
</ins><span class="cx">         Cherry-pick r283332. rdar://problem/85173157
</span><span class="cx"> 
</span><span class="cx">     The DFG/FTL need to be aware that Proxy's can produce "function" for typeof and might be callable
</span></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp (285459 => 285460)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp  2021-11-09 01:08:57 UTC (rev 285459)
+++ branches/safari-612-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp     2021-11-09 01:09:00 UTC (rev 285460)
</span><span class="lines">@@ -745,12 +745,6 @@
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        case op_loop_hint: {
-            if (UNLIKELY(Options::returnEarlyFromInfiniteLoopsForFuzzing()))
-                vm.addLoopHintExecutionCounter(instruction.ptr());
-            break;
-        }
-        
</del><span class="cx">         default:
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -799,13 +793,6 @@
</span><span class="cx">     // So, we can access member UnlinkedCodeBlock safely here. We bypass the assertion by using unvalidatedGet.
</span><span class="cx">     UnlinkedCodeBlock* unlinkedCodeBlock = m_unlinkedCode.unvalidatedGet();
</span><span class="cx"> 
</span><del>-    if (UNLIKELY(Options::returnEarlyFromInfiniteLoopsForFuzzing() && JITCode::isBaselineCode(jitType()))) {
-        for (const auto& instruction : unlinkedCodeBlock->instructions()) {
-            if (instruction->is<OpLoopHint>())
-                vm.removeLoopHintExecutionCounter(instruction.ptr());
-        }
-    }
-
</del><span class="cx">     if (JITCode::isBaselineCode(jitType())) {
</span><span class="cx">         if (m_metadata) {
</span><span class="cx">             m_metadata->forEach<OpCatch>([&](auto& metadata) {
</span></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (285459 => 285460)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp  2021-11-09 01:08:57 UTC (rev 285459)
+++ branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp     2021-11-09 01:09:00 UTC (rev 285460)
</span><span class="lines">@@ -80,6 +80,16 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void UnlinkedCodeBlock::initializeLoopHintExecutionCounter()
+{
+    ASSERT(Options::returnEarlyFromInfiniteLoopsForFuzzing());
+    VM& vm = this->vm();
+    for (const auto& instruction : instructions()) {
+        if (instruction->is<OpLoopHint>())
+            vm.addLoopHintExecutionCounter(instruction.ptr());
+    }
+}
+
</ins><span class="cx"> template<typename Visitor>
</span><span class="cx"> void UnlinkedCodeBlock::visitChildrenImpl(JSCell* cell, Visitor& visitor)
</span><span class="cx"> {
</span><span class="lines">@@ -270,6 +280,13 @@
</span><span class="cx"> 
</span><span class="cx"> UnlinkedCodeBlock::~UnlinkedCodeBlock()
</span><span class="cx"> {
</span><ins>+    if (UNLIKELY(Options::returnEarlyFromInfiniteLoopsForFuzzing())) {
+        VM& vm = this->vm();
+        for (const auto& instruction : instructions()) {
+            if (instruction->is<OpLoopHint>())
+                vm.removeLoopHintExecutionCounter(instruction.ptr());
+        }
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> const InstructionStream& UnlinkedCodeBlock::instructions() const
</span></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (285459 => 285460)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h    2021-11-09 01:08:57 UTC (rev 285459)
+++ branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h       2021-11-09 01:09:00 UTC (rev 285460)
</span><span class="lines">@@ -138,6 +138,8 @@
</span><span class="cx"> 
</span><span class="cx">     enum { CallFunction, ApplyFunction };
</span><span class="cx"> 
</span><ins>+    void initializeLoopHintExecutionCounter();
+
</ins><span class="cx">     bool isConstructor() const { return m_isConstructor; }
</span><span class="cx">     bool usesCallEval() const { return m_usesCallEval; }
</span><span class="cx">     void setUsesCallEval() { m_usesCallEval = true; }
</span></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCorebytecodeUnlinkedCodeBlockGeneratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlockGenerator.cpp (285459 => 285460)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlockGenerator.cpp 2021-11-09 01:08:57 UTC (rev 285459)
+++ branches/safari-612-branch/Source/JavaScriptCore/bytecode/UnlinkedCodeBlockGenerator.cpp    2021-11-09 01:09:00 UTC (rev 285460)
</span><span class="lines">@@ -152,6 +152,9 @@
</span><span class="cx">             m_codeBlock->m_rareData->m_bitVectors = WTFMove(m_bitVectors);
</span><span class="cx">             m_codeBlock->m_rareData->m_constantIdentifierSets = WTFMove(m_constantIdentifierSets);
</span><span class="cx">         }
</span><ins>+
+        if (UNLIKELY(Options::returnEarlyFromInfiniteLoopsForFuzzing()))
+            m_codeBlock->initializeLoopHintExecutionCounter();
</ins><span class="cx">     }
</span><span class="cx">     m_vm.heap.writeBarrier(m_codeBlock.get());
</span><span class="cx">     m_vm.heap.reportExtraMemoryAllocated(m_codeBlock->m_instructions->sizeInBytes() + m_codeBlock->m_metadata->sizeInBytes());
</span></span></pre>
</div>
</div>

</body>
</html>