1 files changed, 62 insertions, 0 deletions
diff --git a/js/src/tests/non262/Iterator/prototype/map/proxy-abrupt-completion-in-yield.js b/js/src/tests/non262/Iterator/prototype/map/proxy-abrupt-completion-in-yield.js
new file mode 100644
index 0000000000..4d4854da36
--- /dev/null
+++ b/js/src/tests/non262/Iterator/prototype/map/proxy-abrupt-completion-in-yield.js
@@ -0,0 +1,62 @@
+// |reftest| skip-if(!this.hasOwnProperty('Iterator'))
+//
+
+/*---
+esid: pending
+description: %Iterator.prototype%.map calls return when yield throws.
+info: >
+features: [iterator-helpers]
+---*/
+
+class TestError extends Error {}
+
+class TestIterator extends Iterator {
+  constructor(log) {
+    super();
+    this.log = log;
+  }
+
+  next() {
+    return {done: false, value: 0};
+  }
+
+  return(value) {
+    log.push('close iterator');
+    return {done: true, value};
+  }
+}
+
+const handlerProxy = log => new Proxy({}, {
+  get: (target, key, receiver) => (...args) => {
+    const target = args[0];
+    const item = Reflect[key](...args);
+
+    log.push(`${key}: ${args.filter(x => typeof x != 'object').map(x => x.toString())}`);
+
+    switch (typeof item) {
+      case 'function': return item.bind(new Proxy(target, handlerProxy(log)));
+      case 'object': return new Proxy(item, handlerProxy(log));
+      default: return item;
+    }
+  },
+});
+
+const log = [];
+const iterator = new TestIterator(log);
+const iteratorProxy = new Proxy(iterator, handlerProxy(log));
+const mappedProxy = iteratorProxy.map(x => x);
+
+mappedProxy.next();
+assertThrowsInstanceOf(() => mappedProxy.throw(new TestError()), TestError);
+mappedProxy.next();
+
+assertEq(
+  log.join('\n'),
+`get: map
+get: next
+get: return
+close iterator`
+);
+
+if (typeof reportCompare == 'function')
+  reportCompare(0, 0);