Skip to content

V
V8
Commit d3aefe8c authored by neis's avatar neis Committed by Commit bot
Browse files
Options

[parser] Fix bug in for-of desugaring. 

When reading the value property of an iterator result fails, we must not close the iterator.
This was not discovered earlier because the tests had a subtle bug.

This CL fixes both the desugaring and the tests.

BUG=

Review-Url: https://codereview.chromium.org/2119353002
Cr-Commit-Position: refs/heads/master@{#37571}
parent 1829eb66
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 326 additions and 330 deletions
src/parsing/parser.cc
View file @ d3aefe8c
This diff is collapsed.
src/parsing/parser.h
View file @ d3aefe8c
......@@ -458,7 +458,8 @@ class ParserTraits {
void FinalizeIteratorUse(Variable* completion, Expression* condition,
Variable* iter, Block* iterator_use, Block* result);
Statement* FinalizeForOfStatement(ForOfStatement* loop, int pos);
Statement* FinalizeForOfStatement(ForOfStatement* loop, Variable* completion,
int pos);
// Reporting errors.
void ReportMessageAt(Scanner::Location source_location,
......@@ -961,12 +962,13 @@ class Parser : public ParserBase<ParserTraits> {
// Initialize the components of a for-in / for-of statement.
void InitializeForEachStatement(ForEachStatement* stmt, Expression* each,
Expression* subject, Statement* body,
int each_keyword_pos);
void InitializeForOfStatement(ForOfStatement* stmt, Expression* each,
Expression* iterable, Statement* body,
int next_result_pos = kNoSourcePosition);
Statement* InitializeForEachStatement(ForEachStatement* stmt,
Expression* each, Expression* subject,
Statement* body, int each_keyword_pos);
Statement* InitializeForOfStatement(ForOfStatement* stmt, Expression* each,
Expression* iterable, Statement* body,
bool finalize,
int next_result_pos = kNoSourcePosition);
Statement* DesugarLexicalBindingsInForStatement(
Scope* inner_scope, VariableMode mode,
ZoneList<const AstRawString*>* names, ForStatement* loop, Statement* init,
......
test/cctest/interpreter/bytecode_expectations/ForOf.golden
View file @ d3aefe8c
......@@ -13,10 +13,9 @@ snippet: "
"
frame size: 16
parameter count: 1
bytecode array length: 284
bytecode array length: 283
bytecodes: [
/* 30 E> */ B(StackCheck),
B(LdrUndefined), R(4),
B(LdaZero),
B(Star), R(3),
B(Mov), R(context), R(11),
......@@ -35,16 +34,16 @@ bytecodes: [
B(JumpIfFalse), U8(7),
B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(2), U8(1),
B(LdaNamedProperty), R(2), U8(3), U8(9),
B(JumpIfToBooleanTrue), U8(22),
B(JumpIfToBooleanTrue), U8(23),
B(LdrNamedProperty), R(2), U8(4), U8(11), R(4),
B(LdaSmi), U8(2),
B(Star), R(3),
B(LdrNamedProperty), R(2), U8(4), U8(11), R(0),
B(Ldar), R(0),
B(Mov), R(4), R(0),
/* 34 E> */ B(StackCheck),
B(Mov), R(0), R(7),
B(LdaZero),
B(Star), R(3),
B(Jump), U8(-48),
B(Jump), U8(-49),
B(Jump), U8(41),
B(Star), R(14),
B(LdaConstant), U8(5),
......@@ -143,9 +142,9 @@ constant pool: [
InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
]
handlers: [
[9, 122, 128],
[12, 81, 83],
[201, 211, 213],
[7, 121, 127],
[10, 80, 82],
[200, 210, 212],
]
---
......@@ -155,12 +154,11 @@ snippet: "
"
frame size: 17
parameter count: 1
bytecode array length: 297
bytecode array length: 296
bytecodes: [
/* 30 E> */ B(StackCheck),
/* 42 S> */ B(LdaConstant), U8(0),
B(Star), R(7),
B(LdrUndefined), R(4),
B(LdaZero),
B(Star), R(3),
B(Mov), R(context), R(12),
......@@ -177,18 +175,18 @@ bytecodes: [
B(JumpIfFalse), U8(7),
B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(2), U8(1),
B(LdaNamedProperty), R(2), U8(3), U8(9),
B(JumpIfToBooleanTrue), U8(27),
B(JumpIfToBooleanTrue), U8(28),
B(LdrNamedProperty), R(2), U8(4), U8(11), R(4),
B(LdaSmi), U8(2),
B(Star), R(3),
B(LdrNamedProperty), R(2), U8(4), U8(11), R(0),
B(Ldar), R(0),
B(Mov), R(4), R(0),
/* 54 E> */ B(StackCheck),
B(Mov), R(0), R(8),
/* 73 S> */ B(LdaZero),
B(Star), R(10),
B(Mov), R(0), R(11),
B(Jump), U8(57),
B(Jump), U8(-53),
B(Jump), U8(-54),
B(Jump), U8(41),
B(Star), R(15),
B(LdaConstant), U8(5),
......@@ -292,9 +290,9 @@ constant pool: [
InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
]
handlers: [
[13, 125, 131],
[16, 84, 86],
[205, 215, 217],
[11, 124, 130],
[14, 83, 85],
[204, 214, 216],
]
---
......@@ -306,10 +304,9 @@ snippet: "
"
frame size: 16
parameter count: 1
bytecode array length: 300
bytecode array length: 299
bytecodes: [
/* 30 E> */ B(StackCheck),
B(LdrUndefined), R(4),
B(LdaZero),
B(Star), R(3),
B(Mov), R(context), R(11),
......@@ -328,11 +325,11 @@ bytecodes: [
B(JumpIfFalse), U8(7),
B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(2), U8(1),
B(LdaNamedProperty), R(2), U8(3), U8(9),
B(JumpIfToBooleanTrue), U8(38),
B(JumpIfToBooleanTrue), U8(39),
B(LdrNamedProperty), R(2), U8(4), U8(11), R(4),
B(LdaSmi), U8(2),
B(Star), R(3),
B(LdrNamedProperty), R(2), U8(4), U8(11), R(0),
B(Ldar), R(0),
B(Mov), R(4), R(0),
/* 34 E> */ B(StackCheck),
B(Mov), R(0), R(7),
/* 66 S> */ B(LdaSmi), U8(10),
......@@ -345,7 +342,7 @@ bytecodes: [
/* 104 S> */ B(Jump), U8(7),
B(LdaZero),
B(Star), R(3),
B(Jump), U8(-64),
B(Jump), U8(-65),
B(Jump), U8(41),
B(Star), R(14),
B(LdaConstant), U8(5),
......@@ -444,9 +441,9 @@ constant pool: [
InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
]
handlers: [
[9, 138, 144],
[12, 97, 99],
[217, 227, 229],
[7, 137, 143],
[10, 96, 98],
[216, 226, 228],
]
---
......@@ -456,13 +453,12 @@ snippet: "
"
frame size: 15
parameter count: 1
bytecode array length: 308
bytecode array length: 309
bytecodes: [
/* 30 E> */ B(StackCheck),
/* 42 S> */ B(CreateObjectLiteral), U8(0), U8(0), U8(1),
B(Star), R(8),
B(Star), R(6),
B(LdrUndefined), R(3),
B(LdaZero),
B(Star), R(2),
B(Mov), R(context), R(10),
......@@ -481,10 +477,11 @@ bytecodes: [
B(JumpIfFalse), U8(7),
B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(1), U8(1),
B(LdaNamedProperty), R(1), U8(4), U8(9),
B(JumpIfToBooleanTrue), U8(28),
B(JumpIfToBooleanTrue), U8(31),
/* 67 E> */ B(LdrNamedProperty), R(1), U8(5), U8(11), R(3),
B(LdaSmi), U8(2),
B(Star), R(2),
/* 67 E> */ B(LdaNamedProperty), R(1), U8(5), U8(11),
B(Ldar), R(3),
B(StaNamedPropertySloppy), R(6), U8(6), U8(13),
/* 62 E> */ B(StackCheck),
/* 88 S> */ B(Nop),
......@@ -492,7 +489,7 @@ bytecodes: [
B(LdaZero),
B(Star), R(8),
B(Jump), U8(57),
B(Jump), U8(-54),
B(Jump), U8(-57),
B(Jump), U8(41),
B(Star), R(13),
B(LdaConstant), U8(7),
......@@ -598,8 +595,8 @@ constant pool: [
InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
]
handlers: [
[17, 136, 142],
[20, 95, 97],
[216, 226, 228],
[15, 137, 143],
[18, 96, 98],
[217, 227, 229],
]
test/mjsunit/es6/iterator-close.js
View file @ d3aefe8c
......@@ -966,8 +966,9 @@ function* g() { yield 42; return 88 };
// Next method throws.
{
let closed = false;
g.prototype.next = () => { throw 666; };
g.prototype.return = () => { assertUnreachable() };
g.prototype.return = () => { closed = true; };
assertThrowsEquals(() => {
......@@ -1025,13 +1026,17 @@ function* g() { yield 42; return 88 };
assertThrowsEquals(() => {
(([...x]) => x)(g());
}, 666);
assertFalse(closed);
}
// Value throws.
{
let closed = false;
g.prototype.next = () => ({get value() {throw 666}});
g.prototype.return = () => { assertUnreachable() };
g.prototype.return = () => { closed = true; };
assertThrowsEquals(() => {
......@@ -1089,13 +1094,17 @@ function* g() { yield 42; return 88 };
assertThrowsEquals(() => {
(([...x]) => x)(g());
}, 666);
assertFalse(closed);
}
// Done throws.
{
let closed = false;
g.prototype.next = () => ({get done() {throw 666}});
g.prototype.return = () => { assertUnreachable() };
g.prototype.return = () => { closed = true; };
assertThrowsEquals(() => {
......@@ -1153,6 +1162,9 @@ function* g() { yield 42; return 88 };
assertThrowsEquals(() => {
(([...x]) => x)(g());
}, 666);
assertFalse(closed);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment