<!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>[165249] trunk</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/165249">165249</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-06 22:16:31 -0800 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>If the FTL is build-time enabled then it should be run-time enabled.
Rubber stamped by Geoffrey Garen.
Source/JavaScriptCore:
* runtime/Options.cpp:
(JSC::recomputeDependentOptions):
* runtime/Options.h:
Source/WebKit2:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/mac/WebContextMac.mm:
(WebKit::registerUserDefaultsIfNeeded):
(WebKit::WebContext::platformInitializeWebProcess):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
Tools:
* Scripts/run-jsc-stress-tests:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionscpp">trunk/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjscstresstests">trunk/Tools/Scripts/run-jsc-stress-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165248 => 165249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-07 05:42:57 UTC (rev 165248)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-07 06:16:31 UTC (rev 165249)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-06 Filip Pizlo <fpizlo@apple.com>
+
+ If the FTL is build-time enabled then it should be run-time enabled.
+
+ Rubber stamped by Geoffrey Garen.
+
+ * runtime/Options.cpp:
+ (JSC::recomputeDependentOptions):
+ * runtime/Options.h:
+
</ins><span class="cx"> 2014-03-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [OS X] Web Inspector: Allow Apps using JavaScriptCore to access "com.apple.webinspector" mach port
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (165248 => 165249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp 2014-03-07 05:42:57 UTC (rev 165248)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp 2014-03-07 06:16:31 UTC (rev 165249)
</span><span class="lines">@@ -182,6 +182,7 @@
</span><span class="cx"> #if !ENABLE(JIT)
</span><span class="cx"> Options::useJIT() = false;
</span><span class="cx"> Options::useDFGJIT() = false;
</span><ins>+ Options::useFTLJIT() = false;
</ins><span class="cx"> #endif
</span><span class="cx"> #if !ENABLE(YARR_JIT)
</span><span class="cx"> Options::useRegExpJIT() = false;
</span><span class="lines">@@ -189,6 +190,13 @@
</span><span class="cx"> #if !ENABLE(CONCURRENT_JIT)
</span><span class="cx"> Options::enableConcurrentJIT() = false;
</span><span class="cx"> #endif
</span><ins>+#if !ENABLE(DFG_JIT)
+ Options::useDFGJIT() = false;
+ Options::useFTLJIT() = false;
+#endif
+#if !ENABLE(FTL_JIT)
+ Options::useFTLJIT() = false;
+#endif
</ins><span class="cx">
</span><span class="cx"> if (Options::showDisassembly()
</span><span class="cx"> || Options::showDFGDisassembly()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (165248 => 165249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2014-03-07 05:42:57 UTC (rev 165248)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2014-03-07 06:16:31 UTC (rev 165249)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> v(bool, enableOSREntryToDFG, true) \
</span><span class="cx"> v(bool, enableOSREntryToFTL, true) \
</span><span class="cx"> \
</span><del>- v(bool, useFTLJIT, false) \
</del><ins>+ v(bool, useFTLJIT, true) \
</ins><span class="cx"> v(bool, enableExperimentalFTLCoverage, false) \
</span><span class="cx"> v(bool, useFTLTBAA, true) \
</span><span class="cx"> v(bool, enableLLVMFastISel, false) \
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165248 => 165249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-07 05:42:57 UTC (rev 165248)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-07 06:16:31 UTC (rev 165249)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-06 Filip Pizlo <fpizlo@apple.com>
+
+ If the FTL is build-time enabled then it should be run-time enabled.
+
+ Rubber stamped by Geoffrey Garen.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::registerUserDefaultsIfNeeded):
+ (WebKit::WebContext::platformInitializeWebProcess):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2014-03-06 Hyowon Kim <hw1008.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Move EvasGL classes from WebKit to WebCore namespace.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (165248 => 165249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-03-07 05:42:57 UTC (rev 165248)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-03-07 06:16:31 UTC (rev 165249)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> , shouldForceScreenFontSubstitution(false)
</span><span class="cx"> , shouldEnableKerningAndLigaturesByDefault(false)
</span><span class="cx"> , shouldEnableJIT(false)
</span><del>- , shouldEnableFTL(false)
</del><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> , usesNetworkProcess(false)
</span><span class="lines">@@ -111,7 +110,6 @@
</span><span class="cx"> encoder << shouldForceScreenFontSubstitution;
</span><span class="cx"> encoder << shouldEnableKerningAndLigaturesByDefault;
</span><span class="cx"> encoder << shouldEnableJIT;
</span><del>- encoder << shouldEnableFTL;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="lines">@@ -237,8 +235,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.shouldEnableJIT))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.shouldEnableFTL))
- return false;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (165248 => 165249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-03-07 05:42:57 UTC (rev 165248)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-03-07 06:16:31 UTC (rev 165249)
</span><span class="lines">@@ -132,7 +132,6 @@
</span><span class="cx"> bool shouldForceScreenFontSubstitution;
</span><span class="cx"> bool shouldEnableKerningAndLigaturesByDefault;
</span><span class="cx"> bool shouldEnableJIT;
</span><del>- bool shouldEnableFTL;
</del><span class="cx"> #endif // PLATFORM(COCOA)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (165248 => 165249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-03-07 05:42:57 UTC (rev 165248)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-03-07 06:16:31 UTC (rev 165249)
</span><span class="lines">@@ -67,7 +67,6 @@
</span><span class="cx"> NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
</span><span class="cx"> NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
</span><span class="cx"> NSString *WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey = @"WebKitKerningAndLigaturesEnabledByDefault";
</span><del>-NSString *WebKitJSCFTLEnabledDefaultsKey = @"WebKitJSCFTLEnabledDefaultsKey";
</del><span class="cx"> NSString *WebKitJSCJITEnabledDefaultsKey = @"WebKitJSCJITEnabledDefaultsKey";
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -100,7 +99,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx"> [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
</span><del>- [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitJSCFTLEnabledDefaultsKey];
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> [[NSUserDefaults standardUserDefaults] registerDefaults:registrationDictionary];
</span><span class="lines">@@ -159,7 +157,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> parameters.shouldEnableKerningAndLigaturesByDefault = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
</span><span class="cx"> parameters.shouldEnableJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCJITEnabledDefaultsKey];
</span><del>- parameters.shouldEnableFTL = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLEnabledDefaultsKey];
</del><span class="cx">
</span><span class="cx"> #if HAVE(HOSTED_CORE_ANIMATION)
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (165248 => 165249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-03-07 05:42:57 UTC (rev 165248)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-03-07 06:16:31 UTC (rev 165249)
</span><span class="lines">@@ -180,9 +180,6 @@
</span><span class="cx"> if (!JSC::Options::useJITWasOverridden())
</span><span class="cx"> JSC::Options::useJIT() = parameters.shouldEnableJIT;
</span><span class="cx">
</span><del>- if (!JSC::Options::useFTLJITWasOverridden())
- JSC::Options::useFTLJIT() = parameters.shouldEnableFTL;
-
</del><span class="cx"> setEnhancedAccessibility(parameters.accessibilityEnhancedUserInterfaceEnabled);
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (165248 => 165249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-07 05:42:57 UTC (rev 165248)
+++ trunk/Tools/ChangeLog 2014-03-07 06:16:31 UTC (rev 165249)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2014-03-06 Filip Pizlo <fpizlo@apple.com>
+
+ If the FTL is build-time enabled then it should be run-time enabled.
+
+ Rubber stamped by Geoffrey Garen.
+
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2014-03-06 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> detectFailures in run-jsc-stress-tests can report everything was ok if too many tests fail
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (165248 => 165249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-03-07 05:42:57 UTC (rev 165248)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-03-07 06:16:31 UTC (rev 165249)
</span><span class="lines">@@ -180,6 +180,8 @@
</span><span class="cx">
</span><span class="cx"> EAGER_OPTIONS = ["--thresholdForJITAfterWarmUp=10", "--thresholdForJITSoon=10", "--thresholdForOptimizeAfterWarmUp=20", "--thresholdForOptimizeAfterLongWarmUp=20", "--thresholdForOptimizeSoon=20", "--thresholdForFTLOptimizeAfterWarmUp=20", "--thresholdForFTLOptimizeSoon=20"]
</span><span class="cx">
</span><ins>+NO_FTL_OPTIONS = ["--useFTLJIT=false"]
+
</ins><span class="cx"> FTL_OPTIONS = ["--useFTLJIT=true", "--enableExperimentalFTLCoverage=true"]
</span><span class="cx">
</span><span class="cx"> $runlist = []
</span><span class="lines">@@ -514,7 +516,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def run(kind, *options)
</span><del>- addRunCommand(kind, [pathToVM.to_s] + options + [$benchmark.to_s], silentOutputHandler, simpleErrorHandler)
</del><ins>+ addRunCommand(kind, [pathToVM.to_s] + NO_FTL_OPTIONS + options + [$benchmark.to_s], silentOutputHandler, simpleErrorHandler)
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runDefault
</span></span></pre>
</div>
</div>
</body>
</html>