From ea5ad2a06f82d5e8e7ee976e0843689a079ffa26 Mon Sep 17 00:00:00 2001
From: Robert Fancsik <frobert@inf.u-szeged.hu>
Date: Thu, 19 Dec 2019 19:31:59 +0100
Subject: [PATCH] Fix the parsing/scanning of empty return statement (#3468)

This patch fixes #3467.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
---
 jerry-core/parser/js/js-parser-statm.c    |  1 +
 jerry-core/parser/js/js-scanner.c         |  1 +
 tests/jerry/regression-test-issue-3467.js | 15 +++++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 tests/jerry/regression-test-issue-3467.js

diff --git a/jerry-core/parser/js/js-parser-statm.c b/jerry-core/parser/js/js-parser-statm.c
index b0ef0a945..95ffaa391 100644
--- a/jerry-core/parser/js/js-parser-statm.c
+++ b/jerry-core/parser/js/js-parser-statm.c
@@ -2914,6 +2914,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */
 
         if ((context_p->token.flags & LEXER_WAS_NEWLINE)
             || context_p->token.type == LEXER_SEMICOLON
+            || context_p->token.type == LEXER_EOS
             || context_p->token.type == LEXER_RIGHT_BRACE)
         {
 #if ENABLED (JERRY_ES2015)
diff --git a/jerry-core/parser/js/js-scanner.c b/jerry-core/parser/js/js-scanner.c
index 18eec398c..e0b6e50ae 100644
--- a/jerry-core/parser/js/js-scanner.c
+++ b/jerry-core/parser/js/js-scanner.c
@@ -1591,6 +1591,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */
 
       if (!(context_p->token.flags & LEXER_WAS_NEWLINE)
           && context_p->token.type != LEXER_SEMICOLON
+          && context_p->token.type != LEXER_EOS
           && context_p->token.type != LEXER_RIGHT_BRACE)
       {
         scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION;
diff --git a/tests/jerry/regression-test-issue-3467.js b/tests/jerry/regression-test-issue-3467.js
new file mode 100644
index 000000000..f041b0a9c
--- /dev/null
+++ b/tests/jerry/regression-test-issue-3467.js
@@ -0,0 +1,15 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+assert(new Function("return")() === undefined);