<!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>[242428] releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore</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/242428">242428</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-05 00:44:06 -0800 (Tue, 05 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/241862">r241862</a> - [JSC] Remove WatchpointSet creation for SymbolTable entries if VM::canUseJIT() returns false
https://bugs.webkit.org/show_bug.cgi?id=194891

Reviewed by Geoffrey Garen.

WatchpointSet in SymbolTable is used to fold the value into a constant in JIT tiers. And it is
not useful under the non-JIT mode. This patch avoids creation of WatchpointSet in SymbolTable
if VM::canUseJIT() returns false.

* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* runtime/SymbolTable.cpp:
(JSC::SymbolTableEntry::addWatchpoint): Deleted.
* runtime/SymbolTable.h:
(JSC::SymbolTableEntry::isWatchable const):
(JSC::SymbolTableEntry::watchpointSet):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceJavaScriptCorellintLowLevelInterpreter32_64asm">releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceJavaScriptCorellintLowLevelInterpreter64asm">releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceJavaScriptCoreruntimeSymbolTablecpp">releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/SymbolTable.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceJavaScriptCoreruntimeSymbolTableh">releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/SymbolTable.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit224SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/ChangeLog (242427 => 242428)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/ChangeLog   2019-03-05 08:44:02 UTC (rev 242427)
+++ releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/ChangeLog      2019-03-05 08:44:06 UTC (rev 242428)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2019-02-20  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Remove WatchpointSet creation for SymbolTable entries if VM::canUseJIT() returns false
+        https://bugs.webkit.org/show_bug.cgi?id=194891
+
+        Reviewed by Geoffrey Garen.
+
+        WatchpointSet in SymbolTable is used to fold the value into a constant in JIT tiers. And it is
+        not useful under the non-JIT mode. This patch avoids creation of WatchpointSet in SymbolTable
+        if VM::canUseJIT() returns false.
+
+        * llint/LowLevelInterpreter32_64.asm:
+        * llint/LowLevelInterpreter64.asm:
+        * runtime/SymbolTable.cpp:
+        (JSC::SymbolTableEntry::addWatchpoint): Deleted.
+        * runtime/SymbolTable.h:
+        (JSC::SymbolTableEntry::isWatchable const):
+        (JSC::SymbolTableEntry::watchpointSet):
+
</ins><span class="cx"> 2019-02-20  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add code to validate expected GC activity modelled by doesGC() against what the runtime encounters.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (242427 => 242428)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm  2019-03-05 08:44:02 UTC (rev 242427)
+++ releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm     2019-03-05 08:44:06 UTC (rev 242428)
</span><span class="lines">@@ -2274,7 +2274,9 @@
</span><span class="cx">         get(m_value, t0)
</span><span class="cx">         loadConstantOrVariable(size, t0, t1, t2)
</span><span class="cx">         loadp OpPutToScope::Metadata::m_watchpointSet[t5], t3
</span><ins>+        btpz t3, .noVariableWatchpointSet
</ins><span class="cx">         notifyWrite(t3, .pDynamic)
</span><ins>+    .noVariableWatchpointSet:
</ins><span class="cx">         loadp OpPutToScope::Metadata::m_operand[t5], t0
</span><span class="cx">         storei t1, TagOffset[t0]
</span><span class="cx">         storei t2, PayloadOffset[t0]
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (242427 => 242428)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm     2019-03-05 08:44:02 UTC (rev 242427)
+++ releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm        2019-03-05 08:44:06 UTC (rev 242428)
</span><span class="lines">@@ -2310,8 +2310,10 @@
</span><span class="cx">         get(m_value, t0)
</span><span class="cx">         loadConstantOrVariable(size, t0, t1)
</span><span class="cx">         loadp OpPutToScope::Metadata::m_watchpointSet[t5], t2
</span><ins>+        btpz t2, .noVariableWatchpointSet
+        notifyWrite(t2, .pDynamic)
+    .noVariableWatchpointSet:
</ins><span class="cx">         loadp OpPutToScope::Metadata::m_operand[t5], t0
</span><del>-        notifyWrite(t2, .pDynamic)
</del><span class="cx">         storeq t1, [t0]
</span><span class="cx">     end
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceJavaScriptCoreruntimeSymbolTablecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/SymbolTable.cpp (242427 => 242428)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/SymbolTable.cpp     2019-03-05 08:44:02 UTC (rev 242427)
+++ releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/SymbolTable.cpp        2019-03-05 08:44:06 UTC (rev 242428)
</span><span class="lines">@@ -70,11 +70,6 @@
</span><span class="cx">     entry->m_watchpoints = adoptRef(new WatchpointSet(ClearWatchpoint));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SymbolTableEntry::addWatchpoint(Watchpoint* watchpoint)
-{
-    fatEntry()->m_watchpoints->add(watchpoint);
-}
-
</del><span class="cx"> SymbolTableEntry::FatEntry* SymbolTableEntry::inflateSlow()
</span><span class="cx"> {
</span><span class="cx">     FatEntry* entry = new FatEntry(m_bits);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceJavaScriptCoreruntimeSymbolTableh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/SymbolTable.h (242427 => 242428)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/SymbolTable.h       2019-03-05 08:44:02 UTC (rev 242427)
+++ releases/WebKitGTK/webkit-2.24/Source/JavaScriptCore/runtime/SymbolTable.h  2019-03-05 08:44:06 UTC (rev 242428)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx">     
</span><span class="cx">     bool isWatchable() const
</span><span class="cx">     {
</span><del>-        return (m_bits & KindBitsMask) == ScopeKindBits;
</del><ins>+        return (m_bits & KindBitsMask) == ScopeKindBits && VM::canUseJIT();
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     // Asserts if the offset is anything but a scope offset. This structures the assertions
</span><span class="lines">@@ -291,8 +291,6 @@
</span><span class="cx">     
</span><span class="cx">     void prepareToWatch();
</span><span class="cx">     
</span><del>-    void addWatchpoint(Watchpoint*);
-    
</del><span class="cx">     // This watchpoint set is initialized clear, and goes through the following state transitions:
</span><span class="cx">     // 
</span><span class="cx">     // First write to this var, in any scope that has this symbol table: Clear->IsWatched.
</span><span class="lines">@@ -312,10 +310,12 @@
</span><span class="cx">     // initializes that var in just one of them. This means that a compilation could constant-fold to one
</span><span class="cx">     // of the scopes that still has an undefined value for this variable. That's fine, because at that
</span><span class="cx">     // point any write to any of the instances of that variable would fire the watchpoint.
</span><ins>+    //
+    // Note that watchpointSet() returns nullptr if JIT is disabled.
</ins><span class="cx">     WatchpointSet* watchpointSet()
</span><span class="cx">     {
</span><span class="cx">         if (!isFat())
</span><del>-            return 0;
</del><ins>+            return nullptr;
</ins><span class="cx">         return fatEntry()->m_watchpoints.get();
</span><span class="cx">     }
</span><span class="cx">     
</span></span></pre>
</div>
</div>

</body>
</html>