author | André Bargull <andre.bargull@gmail.com> |
Thu, 22 Dec 2016 03:28:32 -0800 | |
changeset 326890 | 1d5d5babe3d8a4293b6f0b3fdf26fe769fac5300 |
parent 326889 | b9e8df505dd492512aea815efad0122e2e27779b |
child 326891 | c216703bd7e213c3b19b84221e681369e258c506 |
push id | 85067 |
push user | cbook@mozilla.com |
push date | Thu, 22 Dec 2016 13:57:03 +0000 |
treeherder | mozilla-inbound@664f73663acb [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jandem |
bugs | 1319926 |
milestone | 53.0a1 |
backs out | 5a110ad242ead60e71d2186bae78b1fb766ad5ff |
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
|
--- a/js/src/jscompartment.h +++ b/js/src/jscompartment.h @@ -878,17 +878,16 @@ struct JSCompartment DeprecatedExpressionClosure = 3, // Added in JS 1.8 // NO LONGER USING 4 // NO LONGER USING 5 // NO LONGER USING 6 // NO LONGER USING 7 // NO LONGER USING 8 // NO LONGER USING 9 DeprecatedBlockScopeFunRedecl = 10, - DeprecatedStringGenerics = 11, DeprecatedLanguageExtensionCount }; js::ArgumentsObject* getOrCreateArgumentsTemplateObject(JSContext* cx, bool mapped); js::ArgumentsObject* maybeArgumentsTemplateObject(bool mapped) const; private:
--- a/js/src/vm/SelfHosting.cpp +++ b/js/src/vm/SelfHosting.cpp @@ -1910,22 +1910,16 @@ intrinsic_WarnDeprecatedStringMethod(JSC CallArgs args = CallArgsFromVp(argc, vp); MOZ_ASSERT(args.length() == 2); MOZ_ASSERT(args[0].isInt32()); MOZ_ASSERT(args[1].isString()); uint32_t id = uint32_t(args[0].toInt32()); MOZ_ASSERT(id < STRING_GENERICS_METHODS_LIMIT); - NonBuiltinScriptFrameIter iter(cx); - if (!iter.done()) { - const char* filename = iter.filename(); - iter.compartment()->addTelemetry(filename, JSCompartment::DeprecatedStringGenerics); - } - uint32_t mask = (1 << id); if (!(cx->compartment()->warnedAboutStringGenericsMethods & mask)) { JSFlatString* name = args[1].toString()->ensureFlat(cx); if (!name) return false; AutoStableStringChars stableChars(cx); if (!stableChars.initTwoByte(cx, name))
--- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -963,25 +963,25 @@ "n_buckets": 100, "releaseChannelCollection": "opt-out", "description": "GPU process launch time in milliseconds" }, "JS_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT": { "alert_emails": ["jdemooij@mozilla.com"], "expires_in_version": "never", "kind": "enumerated", - "n_values": 11, - "description": "Use of SpiderMonkey's deprecated language extensions in web content: ForEach=0, DestructuringForIn=1 (obsolete), LegacyGenerator=2, ExpressionClosure=3, LetBlock=4 (obsolete), LetExpression=5 (obsolete), NoSuchMethod=6 (obsolete), FlagsArgument=7 (obsolete), RegExpSourceProp=8 (obsolete), RestoredRegExpStatics=9 (obsolete), BlockScopeFunRedecl=10, StringGenerics=11" + "n_values": 10, + "description": "Use of SpiderMonkey's deprecated language extensions in web content: ForEach=0, DestructuringForIn=1 (obsolete), LegacyGenerator=2, ExpressionClosure=3, LetBlock=4 (obsolete), LetExpression=5 (obsolete), NoSuchMethod=6 (obsolete), FlagsArgument=7 (obsolete), RegExpSourceProp=8 (obsolete), RestoredRegExpStatics=9 (obsolete), BlockScopeFunRedecl=10" }, "JS_DEPRECATED_LANGUAGE_EXTENSIONS_IN_ADDONS": { "alert_emails": ["jdemooij@mozilla.com"], "expires_in_version": "never", "kind": "enumerated", - "n_values": 11, - "description": "Use of SpiderMonkey's deprecated language extensions in add-ons: ForEach=0, DestructuringForIn=1 (obsolete), LegacyGenerator=2, ExpressionClosure=3, LetBlock=4 (obsolete), LetExpression=5 (obsolete), NoSuchMethod=6 (obsolete), FlagsArgument=7 (obsolete), RegExpSourceProp=8 (obsolete), RestoredRegExpStatics=9 (obsolete), BlockScopeFunRedecl=10, StringGenerics=11" + "n_values": 10, + "description": "Use of SpiderMonkey's deprecated language extensions in add-ons: ForEach=0, DestructuringForIn=1 (obsolete), LegacyGenerator=2, ExpressionClosure=3, LetBlock=4 (obsolete), LetExpression=5 (obsolete), NoSuchMethod=6 (obsolete), FlagsArgument=7 (obsolete), RegExpSourceProp=8 (obsolete), RestoredRegExpStatics=9 (obsolete), BlockScopeFunRedecl=10" }, "XUL_CACHE_DISABLED": { "expires_in_version": "default", "kind": "flag", "description": "XUL cache was disabled" }, "MEMORY_RESIDENT_FAST": { "alert_emails": ["memshrink-telemetry-alerts@mozilla.com"],