Landings for Stack Containing D224921

Successfully landed

Landing requested on , by dminor@mozilla.com.

Revisions: D224921 diff 926733

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

Failed to land

Landing requested on , by dminor@mozilla.com.

Revisions: D224921 diff 926231

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

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

js/src/vm/JSObject.cpp @ b26745c93182feada10cbe8c2fcec9f82e7dd24d

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

--- JSObject.cpp
+++ JSObject.cpp
@@ -2299,10 +2299,18 @@
   // 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;
   }
+
+  // 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_joint_iteration() &&
+      id == NameToId(cx->names().zip)) {
+    return true;
+  }
 #endif
 
   if (key == JSProto_JSON &&
       !JS::Prefs::experimental_json_parse_with_source() &&
       (id == NameToId(cx->names().isRawJSON) ||

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

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

patching file js/src/vm/JSObject.cpp
Hunk #1 FAILED at 2298
1 out of 1 hunks FAILED -- saving rejects to file js/src/vm/JSObject.cpp.rej
abort: patch failed to apply

Stack containing revision D224921

Land		Bug	Status	Revision	Reviewers
		1923146	Blocked Repository is not supported by Lando. Closed	D224921: Bug 1923146 - Add placeholder for Iterator.zip; r=dminor!	@dminor accepted a prior diff