Merging upstream version 127.0.

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

2 files changed, 14 insertions, 26 deletions

diff --git a/js/src/tests/test262/annexB/language/eval-code/direct/script-decl-lex-collision-in-sloppy-mode.js b/js/src/tests/test262/annexB/language/eval-code/direct/script-decl-lex-collision-in-sloppy-mode.js
deleted file mode 100644
index 58d5a125b5..0000000000
--- a/js/src/tests/test262/annexB/language/eval-code/direct/script-decl-lex-collision-in-sloppy-mode.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (C) 2023 Alexey Shvayka. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-globaldeclarationinstantiation
-description: Let binding collision with existing var declaration that was created for hoisted function.
-info: |
-  [...]
-  3. For each element name of lexNames, do
-    a. If env.HasVarDeclaration(name) is true, throw a SyntaxError exception.
-flags: [noStrict]
----*/
-
-eval('if (true) { function test262Fn() {} }');
-
-assert.throws(SyntaxError, function() {
-  $262.evalScript('var x; let test262Fn;');
-});
-
-assert.throws(ReferenceError, function() {
-  x;
-}, 'no bindings created');
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/annexB/language/eval-code/direct/script-decl-lex-no-collision-in-strict-mode-strict.js b/js/src/tests/test262/annexB/language/eval-code/direct/script-decl-lex-no-collision.js
index da859c843d..643b11831d 100644
--- a/js/src/tests/test262/annexB/language/eval-code/direct/script-decl-lex-no-collision-in-strict-mode-strict.js
+++ b/js/src/tests/test262/annexB/language/eval-code/direct/script-decl-lex-no-collision.js
@@ -1,10 +1,11 @@
-'use strict';
 // Copyright (C) 2023 Alexey Shvayka. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-globaldeclarationinstantiation
-description: No let binding collision with existing var declaration due to strict-mode eval().
+description: No let binding collision with existing var declaration due to eval().
 info: |
+  In strict mode:
+
   PerformEval ( x, strictCaller, direct )
 
   [...]
@@ -12,7 +13,17 @@ info: |
     a. Let lexEnv be NewDeclarativeEnvironment(runningContext's LexicalEnvironment).
   [...]
   18. If strictEval is true, set varEnv to lexEnv.
-flags: [onlyStrict]
+
+  In sloppy mode:
+
+  GlobalDeclarationInstantiation ( script, env )
+
+  [...]
+  3. For each element name of lexNames, do
+    a. If env.HasLexicalDeclaration(name) is true, throw a SyntaxError exception.
+    b. Let hasRestrictedGlobal be ? env.HasRestrictedGlobalProperty(name).
+    c. NOTE: Global var and function bindings (except those that are introduced by non-strict direct eval) are non-configurable and are therefore restricted global properties.
+    d. If hasRestrictedGlobal is true, throw a SyntaxError exception.
 ---*/
 
 eval('if (true) { function test262Fn() {} }');