Skip to content

Commit a9f8db9

Browse files
committed
Ensure that GeneratorReturnExceptions are not handled by InterpreterStackFrame::DebugProcess
1 parent b73ed83 commit a9f8db9

File tree

7 files changed

+40
-165
lines changed

7 files changed

+40
-165
lines changed

test/DebuggerCommon/generators.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,28 @@ g = gf4(); /**bp:
124124
125125
stack();resume('step_into');
126126
stack();resume('step_into');
127-
stack();resume('step_into');
128-
stack();resume('step_out');
129-
stack();resume('step_out');
130127
**/
131128

132129
g.next(1);
133130
g.return(2);
134131

132+
function* gf5() {
133+
try {
134+
yield 32;
135+
} catch (e) {
136+
}
137+
}
138+
139+
g = gf5(); /**bp:
140+
stack();resume('step_over');
141+
142+
resume('step_over');
143+
144+
stack();resume('step_into');
145+
stack();resume('step_out');
146+
stack();
147+
**/
148+
g.next();
149+
g.return(1);
150+
135151
WScript.Echo("PASS");

test/DebuggerCommon/generators.js.dbg.baseline

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@
524524
{
525525
"callStack": [
526526
{
527-
"line": 132,
527+
"line": 129,
528528
"column": 0,
529529
"sourceText": "g.return(2)",
530530
"function": "Global code"
@@ -540,7 +540,7 @@
540540
"function": "gf4"
541541
},
542542
{
543-
"line": 132,
543+
"line": 129,
544544
"column": 0,
545545
"sourceText": "g.return(2)",
546546
"function": "Global code"
@@ -550,59 +550,45 @@
550550
{
551551
"callStack": [
552552
{
553-
"line": 77,
554-
"column": 4,
555-
"sourceText": "yield 1",
556-
"function": "gf3"
557-
},
558-
{
559-
"line": 82,
560-
"column": 4,
561-
"sourceText": "yield* gf3()",
562-
"function": "gf4"
563-
},
564-
{
565-
"line": 132,
553+
"line": 138,
566554
"column": 0,
567-
"sourceText": "g.return(2)",
555+
"sourceText": "g = gf5()",
568556
"function": "Global code"
569557
}
570558
]
571559
},
572560
{
573561
"callStack": [
574562
{
575-
"line": 78,
576-
"column": 4,
577-
"sourceText": "yield 2",
578-
"function": "gf3"
579-
},
563+
"line": 148,
564+
"column": 0,
565+
"sourceText": "g.return(1)",
566+
"function": "Global code"
567+
}
568+
]
569+
},
570+
{
571+
"callStack": [
580572
{
581-
"line": 82,
582-
"column": 4,
583-
"sourceText": "yield* gf3()",
584-
"function": "gf4"
573+
"line": 133,
574+
"column": 8,
575+
"sourceText": "yield 32",
576+
"function": "gf5"
585577
},
586578
{
587-
"line": 132,
579+
"line": 148,
588580
"column": 0,
589-
"sourceText": "g.return(2)",
581+
"sourceText": "g.return(1)",
590582
"function": "Global code"
591583
}
592584
]
593585
},
594586
{
595587
"callStack": [
596588
{
597-
"line": 82,
598-
"column": 4,
599-
"sourceText": "yield* gf3()",
600-
"function": "gf4"
601-
},
602-
{
603-
"line": 132,
589+
"line": 150,
604590
"column": 0,
605-
"sourceText": "g.return(2)",
591+
"sourceText": "WScript.Echo(\"PASS\")",
606592
"function": "Global code"
607593
}
608594
]

test/es6/generators-functionality.js.dbg.baseline

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/es6/rlexe.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -868,13 +868,6 @@
868868
<tags>exclude_arm</tags>
869869
</default>
870870
</test>
871-
<test>
872-
<default>
873-
<files>generators-functionality.js</files>
874-
<compile-flags>-dbgbaseline:generators-functionality.js.dbg.baseline -ES6Generators -ES6Classes -ES6DefaultArgs -debuglaunch -args summary -endargs</compile-flags>
875-
<tags>exclude_arm</tags>
876-
</default>
877-
</test>
878871
<test>
879872
<default>
880873
<files>generators-deferred.js</files>

test/es7/asyncawait-functionality.dbg.baseline

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/es7/asyncawait-functionality.js.dbg.baseline

Lines changed: 0 additions & 111 deletions
This file was deleted.

test/es7/rlexe.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@
1919
<baseline>asyncawait-functionality.baseline</baseline>
2020
</default>
2121
</test>
22-
<test>
23-
<default>
24-
<files>asyncawait-functionality.js</files>
25-
<compile-flags>-dbgbaseline:asyncawait-functionality.js.dbg.baseline -es6experimental -nodeferparse -debuglaunch -args summary -endargs</compile-flags>
26-
<baseline>asyncawait-functionality.baseline</baseline>
27-
</default>
28-
</test>
2922
<test>
3023
<default>
3124
<files>asyncawait-functionality.js</files>

0 commit comments

Comments
 (0)