<!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>[194590] 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/194590">194590</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-01-05 11:03:07 -0800 (Tue, 05 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add validation of JSC options to catch typos.
https://bugs.webkit.org/show_bug.cgi?id=152549
Reviewed by Benjamin Poulain.
1. If a JSC_xxx option is found and xxx is not a valid option, we will now log
an error message.
2. The jsc app is commonly used as follows:
$ jsc [jsc options] [scripts]
Previously, we'll continue to parse for [jsc options] after [scripts] is seen.
We won't do this anymore. Any --xxx jsc options must precede the [scripts]
arguments.
3. If a --xxx jsc option is specified, but xxx is not a valid option, we will
now log an error message.
4. Added JSC_validateOptions, which if set to true will cause the VM to crash if
an invalid option was seen during options parsing.
* jsc.cpp:
(CommandLine::parseArguments):
* runtime/Options.cpp:
(JSC::Options::initialize):
* 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 (194589 => 194590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-05 17:58:45 UTC (rev 194589)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-05 19:03:07 UTC (rev 194590)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-12-24 Mark Lam <mark.lam@apple.com>
+
+ Add validation of JSC options to catch typos.
+ https://bugs.webkit.org/show_bug.cgi?id=152549
+
+ Reviewed by Benjamin Poulain.
+
+ 1. If a JSC_xxx option is found and xxx is not a valid option, we will now log
+ an error message.
+ 2. The jsc app is commonly used as follows:
+
+ $ jsc [jsc options] [scripts]
+
+ Previously, we'll continue to parse for [jsc options] after [scripts] is seen.
+ We won't do this anymore. Any --xxx jsc options must precede the [scripts]
+ arguments.
+
+ 3. If a --xxx jsc option is specified, but xxx is not a valid option, we will
+ now log an error message.
+
+ 4. Added JSC_validateOptions, which if set to true will cause the VM to crash if
+ an invalid option was seen during options parsing.
+
+ * jsc.cpp:
+ (CommandLine::parseArguments):
+ * runtime/Options.cpp:
+ (JSC::Options::initialize):
+ * runtime/Options.h:
+
</ins><span class="cx"> 2016-01-04 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Turn off Internal Function inlining in the DFG for super calls.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (194589 => 194590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-01-05 17:58:45 UTC (rev 194589)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-01-05 19:03:07 UTC (rev 194590)
</span><span class="lines">@@ -1889,80 +1889,94 @@
</span><span class="cx"> bool needToDumpOptions = false;
</span><span class="cx"> bool needToExit = false;
</span><span class="cx">
</span><ins>+ bool doneWithJSCOptions = false;
+ bool hasBadJSCOptions = false;
</ins><span class="cx"> for (; i < argc; ++i) {
</span><span class="cx"> const char* arg = argv[i];
</span><del>- if (!strcmp(arg, "-f")) {
- if (++i == argc)
- printUsageStatement();
- m_scripts.append(Script(true, argv[i]));
- continue;
- }
- if (!strcmp(arg, "-e")) {
- if (++i == argc)
- printUsageStatement();
- m_scripts.append(Script(false, argv[i]));
- continue;
- }
- if (!strcmp(arg, "-i")) {
- m_interactive = true;
- continue;
- }
- if (!strcmp(arg, "-d")) {
- m_dump = true;
- continue;
- }
- if (!strcmp(arg, "-p")) {
- if (++i == argc)
- printUsageStatement();
- m_profile = true;
- m_profilerOutput = argv[i];
- continue;
- }
- if (!strcmp(arg, "-m")) {
- m_module = true;
- continue;
- }
- if (!strcmp(arg, "-s")) {
</del><ins>+
+ if (!doneWithJSCOptions) {
+ if (!strcmp(arg, "-f")) {
+ if (++i == argc)
+ printUsageStatement();
+ m_scripts.append(Script(true, argv[i]));
+ continue;
+ }
+ if (!strcmp(arg, "-e")) {
+ if (++i == argc)
+ printUsageStatement();
+ m_scripts.append(Script(false, argv[i]));
+ continue;
+ }
+ if (!strcmp(arg, "-i")) {
+ m_interactive = true;
+ continue;
+ }
+ if (!strcmp(arg, "-d")) {
+ m_dump = true;
+ continue;
+ }
+ if (!strcmp(arg, "-p")) {
+ if (++i == argc)
+ printUsageStatement();
+ m_profile = true;
+ m_profilerOutput = argv[i];
+ continue;
+ }
+ if (!strcmp(arg, "-m")) {
+ m_module = true;
+ continue;
+ }
+ if (!strcmp(arg, "-s")) {
</ins><span class="cx"> #if HAVE(SIGNAL_H)
</span><del>- signal(SIGILL, _exit);
- signal(SIGFPE, _exit);
- signal(SIGBUS, _exit);
- signal(SIGSEGV, _exit);
</del><ins>+ signal(SIGILL, _exit);
+ signal(SIGFPE, _exit);
+ signal(SIGBUS, _exit);
+ signal(SIGSEGV, _exit);
</ins><span class="cx"> #endif
</span><del>- continue;
- }
- if (!strcmp(arg, "-x")) {
- m_exitCode = true;
- continue;
- }
- if (!strcmp(arg, "--")) {
- ++i;
- break;
- }
- if (!strcmp(arg, "-h") || !strcmp(arg, "--help"))
- printUsageStatement(true);
</del><ins>+ continue;
+ }
+ if (!strcmp(arg, "-x")) {
+ m_exitCode = true;
+ continue;
+ }
+ if (!strcmp(arg, "--")) {
+ ++i;
+ break;
+ }
+ if (!strcmp(arg, "-h") || !strcmp(arg, "--help"))
+ printUsageStatement(true);
</ins><span class="cx">
</span><del>- if (!strcmp(arg, "--options")) {
- needToDumpOptions = true;
- needToExit = true;
- continue;
- }
- if (!strcmp(arg, "--dumpOptions")) {
- needToDumpOptions = true;
- continue;
- }
</del><ins>+ if (!strcmp(arg, "--options")) {
+ needToDumpOptions = true;
+ needToExit = true;
+ continue;
+ }
+ if (!strcmp(arg, "--dumpOptions")) {
+ needToDumpOptions = true;
+ continue;
+ }
</ins><span class="cx">
</span><del>- // See if the -- option is a JSC VM option.
- if (strstr(arg, "--") == arg && JSC::Options::setOption(&arg[2])) {
- // The arg was recognized as a VM option and has been parsed.
- continue; // Just continue with the next arg.
- }
</del><ins>+ // See if the -- option is a JSC VM option.
+ if (strstr(arg, "--") == arg) {
+ if (!JSC::Options::setOption(&arg[2])) {
+ hasBadJSCOptions = true;
+ dataLog("ERROR: invalid option: ", arg, "\n");
+ }
+ continue;
+ }
</ins><span class="cx">
</span><ins>+ doneWithJSCOptions = true;
+
+ } // !doneWithJSCOptions
+
</ins><span class="cx"> // This arg is not recognized by the VM nor by jsc. Pass it on to the
</span><span class="cx"> // script.
</span><span class="cx"> m_scripts.append(Script(true, argv[i]));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (hasBadJSCOptions && JSC::Options::validateOptions())
+ CRASH();
+
</ins><span class="cx"> if (m_scripts.isEmpty())
</span><span class="cx"> m_interactive = true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (194589 => 194590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp 2016-01-05 17:58:45 UTC (rev 194589)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp 2016-01-05 19:03:07 UTC (rev 194590)
</span><span class="lines">@@ -39,6 +39,10 @@
</span><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+#include <crt_externs.h>
+#endif
+
</ins><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> #include "MacroAssemblerX86.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -361,10 +365,25 @@
</span><span class="cx"> // Allow environment vars to override options if applicable.
</span><span class="cx"> // The evn var should be the name of the option prefixed with
</span><span class="cx"> // "JSC_".
</span><ins>+#if PLATFORM(COCOA)
+ bool hasBadOptions = false;
+ for (char** envp = *_NSGetEnviron(); *envp; envp++) {
+ const char* env = *envp;
+ if (!strncmp("JSC_", env, 4)) {
+ if (!Options::setOption(&env[4])) {
+ dataLog("ERROR: invalid option: ", *envp, "\n");
+ hasBadOptions = true;
+ }
+ }
+ }
+ if (hasBadOptions && Options::validateOptions())
+ CRASH();
+#else // PLATFORM(COCOA)
</ins><span class="cx"> #define FOR_EACH_OPTION(type_, name_, defaultValue_, description_) \
</span><span class="cx"> overrideOptionWithHeuristic(name_(), "JSC_" #name_);
</span><span class="cx"> JSC_OPTIONS(FOR_EACH_OPTION)
</span><span class="cx"> #undef FOR_EACH_OPTION
</span><ins>+#endif // PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> #if 0
</span><span class="cx"> ; // Deconfuse editors that do auto indentation
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (194589 => 194590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2016-01-05 17:58:45 UTC (rev 194589)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2016-01-05 19:03:07 UTC (rev 194590)
</span><span class="lines">@@ -102,6 +102,7 @@
</span><span class="cx"> typedef const char* optionString;
</span><span class="cx">
</span><span class="cx"> #define JSC_OPTIONS(v) \
</span><ins>+ v(bool, validateOptions, false, "crashes if mis-typed JSC options were passed to the VM") \
</ins><span class="cx"> v(unsigned, dumpOptions, 0, "dumps JSC options (0 = None, 1 = Overridden only, 2 = All, 3 = Verbose)") \
</span><span class="cx"> \
</span><span class="cx"> v(bool, useLLInt, true, "allows the LLINT to be used if true") \
</span></span></pre>
</div>
</div>
</body>
</html>