summaryrefslogtreecommitdiffstats
path: root/js/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'js/src/util')
-rw-r--r--js/src/util/StructuredSpewer.cpp82
-rw-r--r--js/src/util/StructuredSpewer.h5
-rwxr-xr-xjs/src/util/make_unicode.py2
3 files changed, 40 insertions, 49 deletions
diff --git a/js/src/util/StructuredSpewer.cpp b/js/src/util/StructuredSpewer.cpp
index f74570ab0c..72f483c6b5 100644
--- a/js/src/util/StructuredSpewer.cpp
+++ b/js/src/util/StructuredSpewer.cpp
@@ -183,54 +183,46 @@ void StructuredSpewer::parseSpewFlags(const char* flags) {
}
if (ContainsFlag(flags, "help")) {
+ // clang-format off
printf(
- "\n"
- "usage: SPEW=option,option,... where options can be:\n"
- "\n"
- " help Dump this help message\n"
- " channel Enable the selected channel from below, "
- "if\n"
- " more than one channel is specified, then "
- "the\n"
- " channel will be set whichever specified "
- "filter\n"
- " comes first in STRUCTURED_CHANNEL_LIST."
- " AtStartup Enable spewing at browser startup instead\n"
- " of when gecko profiling starts."
- "\n"
- " Channels: \n"
- "\n"
- // List Channels
- " BaselineICStats Dump the IC Entry counters during Ion "
- "analysis\n"
- " ScriptStats Dump statistics collected by tracelogger "
- "that\n"
- " is aggregated by script. Requires\n"
- " JS_TRACE_LOGGING=1\n"
- " CacheIRHealthReport Dump the CacheIR information and "
- "associated "
- "rating\n"
- // End Channel list
- "\n\n"
- "By default output goes to a file called spew_output.$PID.$THREAD\n"
- "\n"
- "Further control of the spewer can be accomplished with the below\n"
- "environment variables:\n"
- "\n"
- " SPEW_FILE: Selects the file to write to. An absolute path.\n"
- "\n"
- " SPEW_FILTER: A string which is matched against 'signature'\n"
- " constructed from a JSScript, currently connsisting of \n"
- " filename:line:col.\n"
- "\n"
- " A JSScript matches the filter string is found in the\n"
- " signature\n"
- "\n"
- " SPEW_UPLOAD: If this variable is set as well as MOZ_UPLOAD_DIR,\n"
- " output goes to $MOZ_UPLOAD_DIR/spew_output* to ease usage\n"
- " with Treeherder.\n"
+ "\n"
+ "usage: SPEW=option,option,... where options can be:\n"
+ "\n"
+ " help Dump this help message\n"
+ " channel Enable the selected channel from below, if\n"
+ " more than one channel is specified, then the\n"
+ " channel will be set whichever specified filter\n"
+ " comes first in STRUCTURED_CHANNEL_LIST.\n"
+ " AtStartup Enable spewing at browser startup instead\n"
+ " of when gecko profiling starts."
+ "\n"
+ " Channels: \n"
+ "\n"
+ // List Channels
+ " BaselineICStats Dump the IC Entry counters during Ion analysis\n"
+ " CacheIRHealthReport Dump the CacheIR information and associated rating\n"
+ // End Channel list
+ "\n\n"
+ "By default output goes to a file called spew_output.$PID.$THREAD\n"
+ "\n"
+ "Further control of the spewer can be accomplished with the below\n"
+ "environment variables:\n"
+ "\n"
+ " SPEW_FILE: Selects the file to write to. An absolute path.\n"
+ "\n"
+ " SPEW_FILTER: A string which is matched against 'signature'\n"
+ " constructed from a JSScript, currently connsisting of \n"
+ " filename:line:col.\n"
+ "\n"
+ " A JSScript matches the filter string is found in the\n"
+ " signature\n"
+ "\n"
+ " SPEW_UPLOAD: If this variable is set as well as MOZ_UPLOAD_DIR,\n"
+ " output goes to $MOZ_UPLOAD_DIR/spew_output* to ease usage\n"
+ " with Treeherder.\n"
);
+ // clang-format on
exit(0);
}
}
diff --git a/js/src/util/StructuredSpewer.h b/js/src/util/StructuredSpewer.h
index 407dc34a25..613ef65b59 100644
--- a/js/src/util/StructuredSpewer.h
+++ b/js/src/util/StructuredSpewer.h
@@ -73,7 +73,6 @@ namespace js {
# define STRUCTURED_CHANNEL_LIST(_) \
_(BaselineICStats) \
- _(ScriptStats) \
_(CacheIRHealthReport)
// Structured spew channels
@@ -187,8 +186,8 @@ class StructuredSpewer {
// Globally selected channel.
StructuredSpewFilter selectedChannel_;
- using NameArray =
- mozilla::EnumeratedArray<SpewChannel, SpewChannel::Count, const char*>;
+ using NameArray = mozilla::EnumeratedArray<SpewChannel, const char*,
+ size_t(SpewChannel::Count)>;
// Channel Names
static NameArray const names_;
diff --git a/js/src/util/make_unicode.py b/js/src/util/make_unicode.py
index 6ddecd6cbb..21ad718f3e 100755
--- a/js/src/util/make_unicode.py
+++ b/js/src/util/make_unicode.py
@@ -1111,7 +1111,7 @@ def make_regexp_space_test(version, test_space_table, codepoint_table):
test_space.write(",\n".join(map(hex_and_name, test_space_table)))
test_space.write("\n);\n")
test_space.write(
- """
+ r"""
assertEq(/^\s+$/.exec(onlySpace) !== null, true);
assertEq(/^[\s]+$/.exec(onlySpace) !== null, true);
assertEq(/^[^\s]+$/.exec(onlySpace) === null, true);