Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 59 insertions, 0 deletions

diff --git a/js/src/tests/test262/built-ins/GeneratorPrototype/return/try-finally-nested-try-catch-within-outer-try-after-nested.js b/js/src/tests/test262/built-ins/GeneratorPrototype/return/try-finally-nested-try-catch-within-outer-try-after-nested.js
new file mode 100644
index 0000000000..a86a1ffa7c
--- /dev/null
+++ b/js/src/tests/test262/built-ins/GeneratorPrototype/return/try-finally-nested-try-catch-within-outer-try-after-nested.js
@@ -0,0 +1,59 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 25.3.1.3
+description: >
+    When a generator is paused within a `try` block of a `try..catch` statement
+    and following a nested `try..catch` statment, `return` should interrupt
+    control flow as if a `return` statement had appeared at that location in
+    the function body.
+features: [generators]
+---*/
+
+var inCatch = 0;
+var inFinally = 0;
+var unreachable = 0;
+
+function* g() {
+  try {
+    try {
+      throw new Error();
+    } catch (e) {
+      inCatch += 1;
+    }
+  } finally {
+    inFinally += 1;
+  }
+  yield;
+  unreachable += 1;
+}
+var iter = g();
+var result;
+
+iter.next();
+
+assert.sameValue(inCatch, 1, '`catch` code path executed');
+assert.sameValue(inFinally, 1, '`finally` code path executed');
+
+result = iter.return(45);
+assert.sameValue(result.value, 45, 'Result `value` following `return`');
+assert.sameValue(result.done, true, 'Result `done` flag following `return`');
+
+assert.sameValue(
+  unreachable,
+  0,
+  'statement following `yield` not executed (following `return`)'
+);
+
+result = iter.next();
+assert.sameValue(
+  result.value, undefined, 'Result `value` is undefined when complete'
+);
+assert.sameValue(
+  result.done, true, 'Result `done` flag is `true` when complete'
+);
+assert.sameValue(
+  unreachable, 0, 'statement following `yield` not executed (once "completed")'
+);
+
+reportCompare(0, 0);