Skip to content

iterator helpers: work around IteratorClose swallowing errors #5152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bakkot wants to merge 1 commit into from
+203 −0
Open

iterator helpers: work around IteratorClose swallowing errors #5152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/concat/next-method-returns-throwing-done.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ info: |
features: [iterator-sequencing]
---*/

var returnMethodCalled = false;

let throwingIterator = {
next() {
return {
Expand All @@ -28,6 +30,7 @@ let throwingIterator = {
};
},
return() {
returnMethodCalled = true;
throw new Error();
}
};
Expand All @@ -43,3 +46,5 @@ let iterator = Iterator.concat(iterable);
assert.throws(Test262Error, function() {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/concat/next-method-returns-throwing-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ info: |
features: [iterator-sequencing]
---*/

var returnMethodCalled = false;

let throwingIterator = {
next() {
return {
Expand All @@ -28,6 +30,7 @@ let throwingIterator = {
};
},
return() {
returnMethodCalled = true;
throw new Error();
}
};
Expand All @@ -43,3 +46,5 @@ let iterator = Iterator.concat(iterable);
assert.throws(Test262Error, function() {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/chunks/get-next-method-throws.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ info: |

features: [iterator-chunking, class]
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
get next() {
throw new Test262Error();
}
get return() {
returnMethodCalled = true;
throw new TypeError;
}
}
Expand All @@ -25,3 +28,5 @@ let iter = new ThrowingIterator();
assert.throws(Test262Error, function () {
iter.chunks(1);
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when getting its next method throws");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/chunks/next-method-returns-non-object.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ info: |

features: [iterator-chunking, class]
---*/

var returnMethodCalled = false;
class NonObjectIterator extends Iterator {
next() {
return null;
}
get return() {
returnMethodCalled = true;
throw new Test262Error();
}
}
Expand All @@ -23,3 +26,5 @@ let iterator = new NonObjectIterator().chunks(1);
assert.throws(TypeError, function () {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns a non-object");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/chunks/next-method-returns-throwing-done.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ info: |

features: [iterator-chunking, class]
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -19,6 +21,7 @@ class ThrowingIterator extends Iterator {
};
}
get return() {
returnMethodCalled = true;
throw new Test262Error();
}
}
Expand All @@ -28,3 +31,5 @@ let iterator = new ThrowingIterator().chunks(1);
assert.throws(Test262Error, function () {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/chunks/next-method-returns-throwing-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ info: |

features: [iterator-chunking, class]
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -19,6 +21,7 @@ class ThrowingIterator extends Iterator {
};
}
get return() {
returnMethodCalled = true;
throw new TypeError();
}
}
Expand All @@ -28,3 +31,5 @@ let iterator = new ThrowingIterator().chunks(1);
assert.throws(Test262Error, function () {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/chunks/next-method-throws.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ info: |

features: [iterator-chunking, class]
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
throw new Test262Error();
}
get return() {
returnMethodCalled = true;
throw new TypeError();
}
}
Expand All @@ -23,3 +26,5 @@ let iterator = new ThrowingIterator().chunks(1);
assert.throws(Test262Error, function () {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method throws");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/drop/next-method-returns-throwing-done.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ info: |
features: [iterator-helpers]
flags: []
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -24,6 +26,7 @@ class ThrowingIterator extends Iterator {
};
}
return() {
returnMethodCalled = true;
throw new Error();
}
}
Expand All @@ -39,3 +42,5 @@ iterator = new ThrowingIterator().drop(1);
assert.throws(Test262Error, function () {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/drop/next-method-returns-throwing-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ info: |
features: [iterator-helpers]
flags: []
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -22,6 +24,7 @@ class ThrowingIterator extends Iterator {
};
}
return() {
returnMethodCalled = true;
throw new Error();
}
}
Expand All @@ -37,3 +40,5 @@ iterator = new ThrowingIterator().drop(1);
assert.throws(Test262Error, function () {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/every/next-method-returns-throwing-done.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ info: |
features: [iterator-helpers]
flags: []
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -22,6 +24,7 @@ class ThrowingIterator extends Iterator {
};
}
return() {
returnMethodCalled = true;
throw new Error();
}
}
Expand All @@ -31,3 +34,5 @@ let iterator = new ThrowingIterator();
assert.throws(Test262Error, function () {
iterator.every(() => {});
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/every/next-method-returns-throwing-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ info: |
features: [iterator-helpers]
flags: []
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -22,6 +24,7 @@ class ThrowingIterator extends Iterator {
};
}
return() {
returnMethodCalled = true;
throw new Error();
}
}
Expand All @@ -31,3 +34,5 @@ let iterator = new ThrowingIterator();
assert.throws(Test262Error, function () {
iterator.every(() => {});
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/filter/next-method-returns-throwing-done.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ info: |
features: [iterator-helpers]
flags: []
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -22,6 +24,7 @@ class ThrowingIterator extends Iterator {
};
}
return() {
returnMethodCalled = true;
throw new Error();
}
}
Expand All @@ -31,3 +34,5 @@ let iterator = new ThrowingIterator().filter(() => true);
assert.throws(Test262Error, function () {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/filter/next-method-returns-throwing-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ info: |
features: [iterator-helpers]
flags: []
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -22,6 +24,7 @@ class ThrowingIterator extends Iterator {
};
}
return() {
returnMethodCalled = true;
throw new Error();
}
}
Expand All @@ -31,3 +34,5 @@ let iterator = new ThrowingIterator().filter(() => true);
assert.throws(Test262Error, function () {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/find/next-method-returns-throwing-done.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ info: |
features: [iterator-helpers]
flags: []
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -20,6 +22,7 @@ class ThrowingIterator extends Iterator {
};
}
return() {
returnMethodCalled = true;
throw new Error();
}
}
Expand All @@ -29,3 +32,5 @@ let iterator = new ThrowingIterator();
assert.throws(Test262Error, function () {
iterator.find(() => {});
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/find/next-method-returns-throwing-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ info: |
features: [iterator-helpers]
flags: []
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -20,6 +22,7 @@ class ThrowingIterator extends Iterator {
};
}
return() {
returnMethodCalled = true;
throw new Error();
}
}
Expand All @@ -29,3 +32,5 @@ let iterator = new ThrowingIterator();
assert.throws(Test262Error, function () {
iterator.find(() => {});
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/flatMap/next-method-returns-throwing-done.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ info: |
features: [iterator-helpers]
flags: []
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -20,6 +22,7 @@ class ThrowingIterator extends Iterator {
};
}
return() {
returnMethodCalled = true;
throw new Error();
}
}
Expand All @@ -29,3 +32,5 @@ let iterator = new ThrowingIterator().flatMap(x => [x]);
assert.throws(Test262Error, function () {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
5 changes: 5 additions & 0 deletions test/built-ins/Iterator/prototype/flatMap/next-method-returns-throwing-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ info: |
features: [iterator-helpers]
flags: []
---*/

var returnMethodCalled = false;
class ThrowingIterator extends Iterator {
next() {
return {
Expand All @@ -20,6 +22,7 @@ class ThrowingIterator extends Iterator {
};
}
return() {
returnMethodCalled = true;
throw new Error();
}
}
Expand All @@ -29,3 +32,5 @@ let iterator = new ThrowingIterator().flatMap(x => [x]);
assert.throws(Test262Error, function () {
iterator.next();
});

assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns an object with throwy getters");
Loading
Loading