From 43e03a1ac63c4ebabc7f22fd6448e38635d914e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20B=C3=A1tyai?= <daniel.batyai@h-lab.eu>
Date: Fri, 25 Sep 2020 10:06:19 +0200
Subject: [PATCH] Fix continue label lookup in for statements that have a
 private scope (#4224)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai daniel.batyai@h-lab.eu
---
 jerry-core/parser/js/js-parser-statm.c | 9 ++++++++-
 tests/test262-es6-excludelist.xml      | 3 ---
 tests/test262-esnext-excludelist.xml   | 3 ---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/jerry-core/parser/js/js-parser-statm.c b/jerry-core/parser/js/js-parser-statm.c
index 8f3774e0d..edc634859 100644
--- a/jerry-core/parser/js/js-parser-statm.c
+++ b/jerry-core/parser/js/js-parser-statm.c
@@ -2336,11 +2336,18 @@ parser_parse_continue_statement (parser_context_t *context_p) /**< context */
         opcode = CBC_JUMP_FORWARD_EXIT_CONTEXT;
       }
 
+#if ENABLED (JERRY_ESNEXT)
+      const bool is_private_scope = (type == PARSER_STATEMENT_PRIVATE_SCOPE
+                                     || type == PARSER_STATEMENT_PRIVATE_CONTEXT);
+#else /* !ENABLED (JERRY_ESNEXT) */
+      const bool is_private_scope = false;
+#endif /* !ENABLED (JERRY_ESNEXT) */
+
       if (parser_statement_flags[type] & PARSER_STATM_CONTINUE_TARGET)
       {
         loop_iterator = iterator;
       }
-      else
+      else if (!is_private_scope)
       {
         loop_iterator.current_p = NULL;
       }
diff --git a/tests/test262-es6-excludelist.xml b/tests/test262-es6-excludelist.xml
index da4462903..cab7a9572 100644
--- a/tests/test262-es6-excludelist.xml
+++ b/tests/test262-es6-excludelist.xml
@@ -321,9 +321,6 @@
   <test id="language/statements/class/name-binding/in-extends-expression-assigned.js"><reason></reason></test>
   <test id="language/statements/class/name-binding/in-extends-expression.js"><reason></reason></test>
   <test id="language/statements/class/syntax/early-errors/class-body-static-method-get-propname-prototype.js"><reason></reason></test>
-  <test id="language/statements/continue/labeled-continue.js"><reason></reason></test>
-  <test id="language/statements/continue/nested-let-bound-for-loops-labeled-continue.js"><reason></reason></test>
-  <test id="language/statements/continue/simple-and-labeled.js"><reason></reason></test>
   <test id="language/statements/for-of/iterator-next-reference.js"><reason>ES2018 change: next method must be cached</reason></test>
   <test id="language/statements/for/S12.6.3_A9.1.js"><reason></reason></test>
   <test id="language/statements/for/S12.6.3_A9.js"><reason></reason></test>
diff --git a/tests/test262-esnext-excludelist.xml b/tests/test262-esnext-excludelist.xml
index 5fc972653..5d2d8f721 100644
--- a/tests/test262-esnext-excludelist.xml
+++ b/tests/test262-esnext-excludelist.xml
@@ -4200,9 +4200,6 @@
   <test id="language/statements/const/dstr/obj-ptrn-rest-getter.js"><reason></reason></test>
   <test id="language/statements/const/dstr/obj-ptrn-rest-skip-non-enumerable.js"><reason></reason></test>
   <test id="language/statements/const/dstr/obj-ptrn-rest-val-obj.js"><reason></reason></test>
-  <test id="language/statements/continue/labeled-continue.js"><reason></reason></test>
-  <test id="language/statements/continue/nested-let-bound-for-loops-labeled-continue.js"><reason></reason></test>
-  <test id="language/statements/continue/simple-and-labeled.js"><reason></reason></test>
   <test id="language/statements/do-while/cptn-abrupt-empty.js"><reason></reason></test>
   <test id="language/statements/do-while/cptn-normal.js"><reason></reason></test>
   <test id="language/statements/for-await-of/async-from-sync-iterator-continuation-abrupt-completion-get-constructor.js"><reason></reason></test>