Bug 1262208: Generalize the disabled compilation mode message for asm.js; r=luke
authorBenjamin Bouvier <benj@benj.me>
Thu, 07 Apr 2016 13:56:24 +0200
changeset 330468 d300e4102b65ff28fc89bd77b731bcd82232d66d
parent 330467 f50bbe259eb0971d77f68d77fb93dd6d5b49ac1a
child 330469 b9f03bb708ec161d070ad425cbadcc301864cdc5
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs1262208
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1262208: Generalize the disabled compilation mode message for asm.js; r=luke MozReview-Commit-ID: ERdr7xy6DeO
js/src/asmjs/AsmJS.cpp
--- a/js/src/asmjs/AsmJS.cpp
+++ b/js/src/asmjs/AsmJS.cpp
@@ -8157,17 +8157,17 @@ Warn(AsmJSParser& parser, int errorNumbe
 static bool
 EstablishPreconditions(ExclusiveContext* cx, AsmJSParser& parser)
 {
     if (!HasCompilerSupport(cx))
         return Warn(parser, JSMSG_USE_ASM_TYPE_FAIL, "Disabled by lack of compiler support");
 
     switch (parser.options().asmJSOption) {
       case AsmJSOption::Disabled:
-        return Warn(parser, JSMSG_USE_ASM_TYPE_FAIL, "Disabled by javascript.options.asmjs in about:config");
+        return Warn(parser, JSMSG_USE_ASM_TYPE_FAIL, "Disabled by 'asmjs' runtime option");
       case AsmJSOption::DisabledByDebugger:
         return Warn(parser, JSMSG_USE_ASM_TYPE_FAIL, "Disabled by debugger");
       case AsmJSOption::Enabled:
         break;
     }
 
     if (parser.pc->isGenerator())
         return Warn(parser, JSMSG_USE_ASM_TYPE_FAIL, "Disabled by generator context");