From 563a5d93e9c01938e2b298eda9421b03b370837e Mon Sep 17 00:00:00 2001
From: Robert Fancsik <frobert@inf.u-szeged.hu>
Date: Mon, 3 Feb 2020 15:12:59 +0100
Subject: [PATCH] Fix 'arguments' and 'caller' properties lazy listing in
 ES2015 profile (#3539)

This patch fixes #3536.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
---
 .../ecma/operations/ecma-function-object.c    | 24 ++++++++-----
 tests/jerry/es2015/function-properties.js     |  2 +-
 .../es2015/regression-test-issue-3536.js      | 36 +++++++++++++++++++
 3 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 tests/jerry/es2015/regression-test-issue-3536.js

diff --git a/jerry-core/ecma/operations/ecma-function-object.c b/jerry-core/ecma/operations/ecma-function-object.c
index e2b152167..863203d58 100644
--- a/jerry-core/ecma/operations/ecma-function-object.c
+++ b/jerry-core/ecma/operations/ecma-function-object.c
@@ -1814,18 +1814,24 @@ ecma_op_function_list_lazy_property_names (ecma_object_t *object_p, /**< functio
 
     /* 'prototype' property is non-enumerable (ECMA-262 v5, 13.2.18) */
     ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_PROTOTYPE));
+
+#if ENABLED (JERRY_ES2015)
+    bool append_caller_and_arguments = !(bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE);
+#else /* !ENABLED (JERRY_ES2015) */
+    bool append_caller_and_arguments = (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE);
+#endif /* ENABLED (JERRY_ES2015) */
+
+    if (append_caller_and_arguments)
+    {
+      /* 'caller' property is non-enumerable (ECMA-262 v5, 13.2.5) */
+      ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLER));
+
+      /* 'arguments' property is non-enumerable (ECMA-262 v5, 13.2.5) */
+      ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_ARGUMENTS));
+    }
 #if ENABLED (JERRY_ES2015)
   }
 #endif /* ENABLED (JERRY_ES2015) */
-
-  if (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE)
-  {
-    /* 'caller' property is non-enumerable (ECMA-262 v5, 13.2.5) */
-    ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLER));
-
-    /* 'arguments' property is non-enumerable (ECMA-262 v5, 13.2.5) */
-    ecma_collection_push_back (for_non_enumerable_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_ARGUMENTS));
-  }
 } /* ecma_op_function_list_lazy_property_names */
 
 /**
diff --git a/tests/jerry/es2015/function-properties.js b/tests/jerry/es2015/function-properties.js
index 1ad28ec74..a80b93c7b 100644
--- a/tests/jerry/es2015/function-properties.js
+++ b/tests/jerry/es2015/function-properties.js
@@ -35,7 +35,7 @@ var prototype_obj = { dummy:1, length:1, caller:null,
 var func = function() {};
 
 Object.setPrototypeOf(func, prototype_obj);
-assert(getProperties(func) == "dummy caller arguments");
+assert(getProperties(func) == "dummy");
 
 var bound_func = (function() {}).bind(null);
 Object.setPrototypeOf(bound_func, prototype_obj);
diff --git a/tests/jerry/es2015/regression-test-issue-3536.js b/tests/jerry/es2015/regression-test-issue-3536.js
new file mode 100644
index 000000000..7ac6a91ed
--- /dev/null
+++ b/tests/jerry/es2015/regression-test-issue-3536.js
@@ -0,0 +1,36 @@
+// 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.
+
+class A {
+  constructor() {
+    var hasProp = $ => {}
+    Object.preventExtensions(hasProp);
+    assert(Object.isSealed(hasProp) === true);
+  }
+  super() {
+    $: $
+  }
+}
+class B extends A {
+  constructor() {
+    super() (super.super)
+  }
+}
+
+try {
+  new B;
+  assert(false);
+} catch (e) {
+  assert(e instanceof TypeError);
+}