<!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>[184354] 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/184354">184354</a></dd>
<dt>Author</dt> <dd>basile_clement@apple.com</dd>
<dt>Date</dt> <dd>2015-05-14 14:32:05 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enforce options coherency
https://bugs.webkit.org/show_bug.cgi?id=144921
Reviewed by Mark Lam.
JavaScriptCore should be failing early when the options are set in such
a way that we don't have a meaningful way to execute JavaScript, rather
than failing for obscure reasons at some point during execution.
This patch adds a new function that checks whether the options are set
in a coherent way, and makes JSC::Options::initialize() crash when the
environment enforces incoherent options.
Client applications able to add or change additional options are
responsible to check for coherency again before starting to actually
execute JavaScript, if any additional options have been set. This is
implemented for the jsc executable in this patch.
* jsc.cpp:
(CommandLine::parseArguments):
* runtime/Options.cpp:
(JSC::Options::initialize):
(JSC::Options::ensureOptionsAreCoherent): Added.
* runtime/Options.h:
(JSC::Options::ensureOptionsAreCoherent): Added.</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 (184353 => 184354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-14 21:28:54 UTC (rev 184353)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-14 21:32:05 UTC (rev 184354)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-05-12 Basile Clement <basile_clement@apple.com>
+
+ Enforce options coherency
+ https://bugs.webkit.org/show_bug.cgi?id=144921
+
+ Reviewed by Mark Lam.
+
+ JavaScriptCore should be failing early when the options are set in such
+ a way that we don't have a meaningful way to execute JavaScript, rather
+ than failing for obscure reasons at some point during execution.
+
+ This patch adds a new function that checks whether the options are set
+ in a coherent way, and makes JSC::Options::initialize() crash when the
+ environment enforces incoherent options.
+ Client applications able to add or change additional options are
+ responsible to check for coherency again before starting to actually
+ execute JavaScript, if any additional options have been set. This is
+ implemented for the jsc executable in this patch.
+
+ * jsc.cpp:
+ (CommandLine::parseArguments):
+ * runtime/Options.cpp:
+ (JSC::Options::initialize):
+ (JSC::Options::ensureOptionsAreCoherent): Added.
+ * runtime/Options.h:
+ (JSC::Options::ensureOptionsAreCoherent): Added.
+
</ins><span class="cx"> 2015-05-14 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r184337): [EFL] unresolved reference errors in ARM builds
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (184353 => 184354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2015-05-14 21:28:54 UTC (rev 184353)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2015-05-14 21:32:05 UTC (rev 184354)
</span><span class="lines">@@ -1485,6 +1485,7 @@
</span><span class="cx">
</span><span class="cx"> if (needToDumpOptions)
</span><span class="cx"> JSC::Options::dumpAllOptions(JSC::Options::DumpLevel::Verbose, "All JSC runtime options:", stderr);
</span><ins>+ JSC::Options::ensureOptionsAreCoherent();
</ins><span class="cx"> if (needToExit)
</span><span class="cx"> jscExit(EXIT_SUCCESS);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (184353 => 184354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp 2015-05-14 21:28:54 UTC (rev 184353)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp 2015-05-14 21:32:05 UTC (rev 184354)
</span><span class="lines">@@ -370,6 +370,8 @@
</span><span class="cx"> }
</span><span class="cx"> dumpAllOptions(level, title);
</span><span class="cx"> }
</span><ins>+
+ ensureOptionsAreCoherent();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Parses a single command line option in the format "<optionName>=<value>"
</span><span class="lines">@@ -440,6 +442,17 @@
</span><span class="cx"> fprintf(stream, "%s", footer);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Options::ensureOptionsAreCoherent()
+{
+ bool coherent = true;
+ if (!(useLLInt() || useJIT())) {
+ coherent = false;
+ dataLog("INCOHERENT OPTIONS: at least one of useLLInt or useJIT must be true\n");
+ }
+ if (!coherent)
+ CRASH();
+}
+
</ins><span class="cx"> void Option::dump(FILE* stream) const
</span><span class="cx"> {
</span><span class="cx"> switch (type()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (184353 => 184354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2015-05-14 21:28:54 UTC (rev 184353)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2015-05-14 21:32:05 UTC (rev 184354)
</span><span class="lines">@@ -351,6 +351,7 @@
</span><span class="cx"> JS_EXPORT_PRIVATE static bool setOption(const char* arg);
</span><span class="cx"> JS_EXPORT_PRIVATE static void dumpAllOptions(DumpLevel, const char* title = nullptr, FILE* stream = stdout);
</span><span class="cx"> static void dumpOption(DumpLevel, OptionID, FILE* stream = stdout, const char* header = "", const char* footer = "");
</span><ins>+ JS_EXPORT_PRIVATE static void ensureOptionsAreCoherent();
</ins><span class="cx">
</span><span class="cx"> // Declare accessors for each option:
</span><span class="cx"> #define FOR_EACH_OPTION(type_, name_, defaultValue_, description_) \
</span></span></pre>
</div>
</div>
</body>
</html>