Landings for Stack Containing D218494

Successfully landed

Landing requested on , by dminor@mozilla.com.

Revisions: D218494 diff 911202

Result: https://hg.mozilla.org/integration/autoland/rev/d9d53f44c7f50077f9e216fb3e9bacdeed3b7547

Failed to land

Landing requested on , by dminor@mozilla.com.

Revisions: D218494 diff 908388

While applying revision D218494 to mozilla-central, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from mozilla-central and re-submitting.)

modules/libpref/init/StaticPrefList.yaml @ 1a9f2e21b25e2c03e26c2558a3ecfce9a5ff6e48

--- StaticPrefList.yaml
+++ StaticPrefList.yaml
...

--- StaticPrefList.yaml
+++ StaticPrefList.yaml
@@ -8063,10 +8063,18 @@
 -   name: javascript.options.experimental.regexp_escape
     type: bool
     value: false
     mirror: always
     set_spidermonkey_pref: startup
+
+  # Experimental support for Promise.try in JavaScript.
+-   name: javascript.options.experimental.promise_try
+    type: bool
+    value: false
+    mirror: always
+    set_spidermonkey_pref: startup
+
 #endif  // NIGHTLY_BUILD
 
 #ifdef ENABLE_JSON_PARSE_WITH_SOURCE
 -   name: javascript.options.experimental.json_parse_with_source
     type: bool

js/src/vm/JSObject.cpp @ a9ac97b908a64ea916dcda5dc08cc9a7e74538ef

--- JSObject.cpp
+++ JSObject.cpp
...

--- JSObject.cpp
+++ JSObject.cpp
@@ -2265,10 +2265,18 @@
   // on the prototype; and the proto of the constructor is JSProto_Function.
   if (key == JSProto_Function && !JS::Prefs::experimental_regexp_escape() &&
       id == NameToId(cx->names().escape)) {
     return true;
   }
+
+  // It's gently surprising that this is JSProto_Function, but the trick
+  // to realize is that this is a -constructor function-, not a function
+  // on the prototype; and the proto of the constructor is JSProto_Function.
+  if (key == JSProto_Function && !JS::Prefs::experimental_promise_try() &&
+      id == NameToId(cx->names().try_)) {
+    return true;
+  }
 #endif
 
 #ifdef ENABLE_JSON_PARSE_WITH_SOURCE
   if (key == JSProto_JSON &&
       !JS::Prefs::experimental_json_parse_with_source() &&

js/src/shell/js.cpp @ 16c78a57883439a9d7e9763fba4d65f67777d465

--- js.cpp
+++ js.cpp
...

--- js.cpp
+++ js.cpp
@@ -12735,10 +12736,13 @@
     JS::Prefs::setAtStartup_experimental_regexp_modifiers(true);
   }
   if (op.getBoolOption("enable-regexp-escape")) {
     JS::Prefs::setAtStartup_experimental_regexp_escape(true);
   }
+  if (op.getBoolOption("enable-promise-try")) {
+    JS::Prefs::setAtStartup_experimental_promise_try(true);
+  }
 #endif
 #ifdef ENABLE_JSON_PARSE_WITH_SOURCE
   if (op.getBoolOption("enable-json-parse-with-source")) {
     JS::Prefs::set_experimental_json_parse_with_source(true);
   }

Raw error output:
Problem while applying patch in revision 218494:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmprzb9qo_r: applying /tmp/tmprzb9qo_r

patching file modules/libpref/init/StaticPrefList.yaml
Hunk #1 FAILED at 8062
1 out of 1 hunks FAILED -- saving rejects to file modules/libpref/init/StaticPrefList.yaml.rej
patching file js/src/vm/JSObject.cpp
Hunk #1 FAILED at 2264
1 out of 1 hunks FAILED -- saving rejects to file js/src/vm/JSObject.cpp.rej
patching file js/src/shell/js.cpp
Hunk #2 FAILED at 12735
1 out of 2 hunks FAILED -- saving rejects to file js/src/shell/js.cpp.rej
abort: patch failed to apply

Stack containing revision D218494

Land		Bug	Status	Revision	Reviewers
		1905364	Blocked Repository is not supported by Lando. Closed	D218494: Bug 1905364 - Implement Promise.try. r?dminor	@dminor accepted a prior diff @arai accepted a prior diff