<!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>[244505] trunk/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/244505">244505</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2019-04-22 11:30:16 -0700 (Mon, 22 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] useJIT should subsume useRegExpJIT
https://bugs.webkit.org/show_bug.cgi?id=197153

Reviewed by Alex Christensen.

useJIT should subsume useRegExpJIT. We should immediately disable JIT feature if useJIT = false,
even if useRegExpJIT is true.

* dfg/DFGCapabilities.cpp:
(JSC::DFG::isSupported):
* runtime/Options.cpp:
(JSC::recomputeDependentOptions):
* runtime/RegExp.cpp:
(JSC::RegExp::compile):
(JSC::RegExp::compileMatchOnly):
* runtime/VM.cpp:
(JSC::enableAssembler):
(JSC::VM::canUseRegExpJIT): Deleted.
* runtime/VM.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCapabilitiescpp">trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionscpp">trunk/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpcpp">trunk/Source/JavaScriptCore/runtime/RegExp.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (244504 => 244505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-04-22 18:29:40 UTC (rev 244504)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-04-22 18:30:16 UTC (rev 244505)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2019-04-22  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] useJIT should subsume useRegExpJIT
+        https://bugs.webkit.org/show_bug.cgi?id=197153
+
+        Reviewed by Alex Christensen.
+
+        useJIT should subsume useRegExpJIT. We should immediately disable JIT feature if useJIT = false,
+        even if useRegExpJIT is true.
+
+        * dfg/DFGCapabilities.cpp:
+        (JSC::DFG::isSupported):
+        * runtime/Options.cpp:
+        (JSC::recomputeDependentOptions):
+        * runtime/RegExp.cpp:
+        (JSC::RegExp::compile):
+        (JSC::RegExp::compileMatchOnly):
+        * runtime/VM.cpp:
+        (JSC::enableAssembler):
+        (JSC::VM::canUseRegExpJIT): Deleted.
+        * runtime/VM.h:
+
</ins><span class="cx"> 2019-04-22  Basuke Suzuki  <basuke.suzuki@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [PlayStation] Restructuring Remote Inspector classes to support multiple platform.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (244504 => 244505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp      2019-04-22 18:29:40 UTC (rev 244504)
+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2019-04-22 18:30:16 UTC (rev 244505)
</span><span class="lines">@@ -38,8 +38,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool isSupported()
</span><span class="cx"> {
</span><del>-    return Options::useDFGJIT()
-        && MacroAssembler::supportsFloatingPoint();
</del><ins>+    return VM::canUseJIT() && Options::useDFGJIT() && MacroAssembler::supportsFloatingPoint();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool isSupportedForInlining(CodeBlock* codeBlock)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (244504 => 244505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp  2019-04-22 18:29:40 UTC (rev 244504)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp     2019-04-22 18:30:16 UTC (rev 244505)
</span><span class="lines">@@ -392,16 +392,18 @@
</span><span class="cx"> #if !ENABLE(JIT)
</span><span class="cx">     Options::useLLInt() = true;
</span><span class="cx">     Options::useJIT() = false;
</span><ins>+    Options::useBaselineJIT() = false;
</ins><span class="cx">     Options::useDFGJIT() = false;
</span><span class="cx">     Options::useFTLJIT() = false;
</span><span class="cx">     Options::useDOMJIT() = false;
</span><del>-#endif
-#if !ENABLE(YARR_JIT)
</del><span class="cx">     Options::useRegExpJIT() = false;
</span><span class="cx"> #endif
</span><span class="cx"> #if !ENABLE(CONCURRENT_JS)
</span><span class="cx">     Options::useConcurrentJIT() = false;
</span><span class="cx"> #endif
</span><ins>+#if !ENABLE(YARR_JIT)
+    Options::useRegExpJIT() = false;
+#endif
</ins><span class="cx"> #if !ENABLE(DFG_JIT)
</span><span class="cx">     Options::useDFGJIT() = false;
</span><span class="cx">     Options::useFTLJIT() = false;
</span><span class="lines">@@ -413,12 +415,6 @@
</span><span class="cx"> #if !CPU(X86_64) && !CPU(ARM64)
</span><span class="cx">     Options::useConcurrentGC() = false;
</span><span class="cx"> #endif
</span><del>-    
-#if ENABLE(JIT) && CPU(X86)
-    // Disable JIT on IA-32 if SSE2 is not present
-    if (!MacroAssemblerX86::supportsFloatingPoint())
-        Options::useJIT() = false;
-#endif
</del><span class="cx"> 
</span><span class="cx">     if (!Options::useJIT()) {
</span><span class="cx">         Options::useSigillCrashAnalyzer() = false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.cpp (244504 => 244505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.cpp   2019-04-22 18:29:40 UTC (rev 244504)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.cpp      2019-04-22 18:30:16 UTC (rev 244505)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(YARR_JIT)
</span><del>-    if (!pattern.containsUnsignedLengthPattern() && VM::canUseRegExpJIT()
</del><ins>+    if (!pattern.containsUnsignedLengthPattern() && VM::canUseJIT() && Options::useRegExpJIT()
</ins><span class="cx"> #if !ENABLE(YARR_JIT_BACKREFERENCES)
</span><span class="cx">         && !pattern.m_containsBackreferences
</span><span class="cx"> #endif
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(YARR_JIT)
</span><del>-    if (!pattern.containsUnsignedLengthPattern() && VM::canUseRegExpJIT()
</del><ins>+    if (!pattern.containsUnsignedLengthPattern() && VM::canUseJIT() && Options::useRegExpJIT()
</ins><span class="cx"> #if !ENABLE(YARR_JIT_BACKREFERENCES)
</span><span class="cx">         && !pattern.m_containsBackreferences
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (244504 => 244505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp       2019-04-22 18:29:40 UTC (rev 244504)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp  2019-04-22 18:30:16 UTC (rev 244505)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> #if ENABLE(ASSEMBLER)
</span><span class="cx"> static bool enableAssembler()
</span><span class="cx"> {
</span><del>-    if (!Options::useJIT() && !Options::useRegExpJIT())
</del><ins>+    if (!Options::useJIT())
</ins><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     char* canUseJITString = getenv("JavaScriptCoreUseJIT");
</span><span class="lines">@@ -233,20 +233,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool VM::canUseRegExpJIT()
-{
-#if ENABLE(YARR_JIT)
-    static std::once_flag onceKey;
-    static bool enabled = false;
-    std::call_once(onceKey, [] {
-        enabled = VM::canUseAssembler() && Options::useRegExpJIT();
-    });
-    return enabled;
-#else
-    return false; // interpreter only
-#endif
-}
-
</del><span class="cx"> bool VM::isInMiniMode()
</span><span class="cx"> {
</span><span class="cx">     return !canUseJIT() || Options::forceMiniVMMode();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (244504 => 244505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2019-04-22 18:29:40 UTC (rev 244504)
+++ trunk/Source/JavaScriptCore/runtime/VM.h    2019-04-22 18:30:16 UTC (rev 244505)
</span><span class="lines">@@ -633,7 +633,6 @@
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     static JS_EXPORT_PRIVATE bool canUseAssembler();
</span><del>-    static JS_EXPORT_PRIVATE bool canUseRegExpJIT();
</del><span class="cx">     static JS_EXPORT_PRIVATE bool isInMiniMode();
</span><span class="cx"> 
</span><span class="cx">     static void computeCanUseJIT();
</span></span></pre>
</div>
</div>

</body>
</html>