<!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>[209553] 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/209553">209553</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-12-08 11:43:31 -0800 (Thu, 08 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable JSC restricted options by default in the jsc shell.
https://bugs.webkit.org/show_bug.cgi?id=165615
Reviewed by Keith Miller.
The jsc shell is only used for debugging and development testing. We should
allow it to use restricted options like JSC_useDollarVM even for release builds.
* jsc.cpp:
(jscmain):
* runtime/Options.cpp:
(JSC::Options::enableRestrictedOptions):
(JSC::Options::isAvailable):
(JSC::allowRestrictedOptions): Deleted.
* runtime/Options.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209552 => 209553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-08 19:18:27 UTC (rev 209552)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-08 19:43:31 UTC (rev 209553)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-12-08 Mark Lam <mark.lam@apple.com>
+
+ Enable JSC restricted options by default in the jsc shell.
+ https://bugs.webkit.org/show_bug.cgi?id=165615
+
+ Reviewed by Keith Miller.
+
+ The jsc shell is only used for debugging and development testing. We should
+ allow it to use restricted options like JSC_useDollarVM even for release builds.
+
+ * jsc.cpp:
+ (jscmain):
+ * runtime/Options.cpp:
+ (JSC::Options::enableRestrictedOptions):
+ (JSC::Options::isAvailable):
+ (JSC::allowRestrictedOptions): Deleted.
+ * runtime/Options.h:
+
</ins><span class="cx"> 2016-12-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r209489.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (209552 => 209553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-12-08 19:18:27 UTC (rev 209552)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-12-08 19:43:31 UTC (rev 209553)
</span><span class="lines">@@ -3221,6 +3221,9 @@
</span><span class="cx">
</span><span class="cx"> int jscmain(int argc, char** argv)
</span><span class="cx"> {
</span><ins>+ // Need to override and enable restricted options before we start parsing options below.
+ Options::enableRestrictedOptions(true);
+
</ins><span class="cx"> // Note that the options parsing can affect VM creation, and thus
</span><span class="cx"> // comes first.
</span><span class="cx"> CommandLine options(argc, argv);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (209552 => 209553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp 2016-12-08 19:18:27 UTC (rev 209552)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp 2016-12-08 19:43:31 UTC (rev 209553)
</span><span class="lines">@@ -55,15 +55,19 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-static bool allowRestrictedOptions()
-{
</del><ins>+namespace {
</ins><span class="cx"> #ifdef NDEBUG
</span><del>- return false;
</del><ins>+bool restrictedOptionsEnabled = false;
</ins><span class="cx"> #else
</span><del>- return true;
</del><ins>+bool restrictedOptionsEnabled = true;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Options::enableRestrictedOptions(bool enableOrNot)
+{
+ restrictedOptionsEnabled = enableOrNot;
+}
+
</ins><span class="cx"> static bool parse(const char* string, bool& value)
</span><span class="cx"> {
</span><span class="cx"> if (!strcasecmp(string, "true") || !strcasecmp(string, "yes") || !strcmp(string, "1")) {
</span><span class="lines">@@ -128,7 +132,7 @@
</span><span class="cx"> bool Options::isAvailable(Options::ID id, Options::Availability availability)
</span><span class="cx"> {
</span><span class="cx"> if (availability == Availability::Restricted)
</span><del>- return allowRestrictedOptions();
</del><ins>+ return restrictedOptionsEnabled;
</ins><span class="cx"> ASSERT(availability == Availability::Configurable);
</span><span class="cx">
</span><span class="cx"> UNUSED_PARAM(id);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (209552 => 209553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2016-12-08 19:18:27 UTC (rev 209552)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2016-12-08 19:43:31 UTC (rev 209553)
</span><span class="lines">@@ -506,6 +506,8 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static void ensureOptionsAreCoherent();
</span><span class="cx">
</span><ins>+ JS_EXPORT_PRIVATE static void enableRestrictedOptions(bool enableOrNot);
+
</ins><span class="cx"> // Declare accessors for each option:
</span><span class="cx"> #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
</span><span class="cx"> ALWAYS_INLINE static type_& name_() { return s_options[name_##ID].type_##Val; } \
</span></span></pre>
</div>
</div>
</body>
</html>