Adding upstream version 124.0.1.upstream/124.0.1

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

1 files changed, 74 insertions, 0 deletions

diff --git a/js/src/jit-test/tests/debug/envChain_frame-eval-with-eval.js b/js/src/jit-test/tests/debug/envChain_frame-eval-with-eval.js
new file mode 100644
index 0000000000..166231aff8
--- /dev/null
+++ b/js/src/jit-test/tests/debug/envChain_frame-eval-with-eval.js
@@ -0,0 +1,74 @@
+// Verify the environment chain for Debugger.Frame described in
+// js/src/vm/EnvironmentObject.h.
+
+const g = newGlobal({ newCompartment: true });
+const dbg = Debugger(g);
+
+dbg.onEnterFrame = frame => {
+  if (frame.script.displayName !== "target") {
+    return;
+  }
+  dbg.onEnterFrame = () => {};
+
+  const envs = JSON.parse(frame.eval(`
+// Put direct eval to de-optimize lexical.
+eval("");
+var qualified = 10;
+unqualified = 20;
+let lexical = 30;
+this.prop = 40;
+
+const envs = [];
+let env = getInnerMostEnvironmentObject();
+while (env) {
+  envs.push({
+    type: getEnvironmentObjectType(env) || "*global*",
+    qualified: !!Object.getOwnPropertyDescriptor(env, "qualified"),
+    unqualified: !!Object.getOwnPropertyDescriptor(env, "unqualified"),
+    lexical: !!Object.getOwnPropertyDescriptor(env, "lexical"),
+    prop: !!Object.getOwnPropertyDescriptor(env, "prop"),
+  });
+
+  env = getEnclosingEnvironmentObject(env);
+}
+JSON.stringify(envs);
+`).return);
+
+  assertEq(envs.length, 4);
+
+  let i = 0, env;
+
+  env = envs[i]; i++;
+  assertEq(env.type, "BlockLexicalEnvironmentObject");
+  assertEq(env.qualified, false);
+  assertEq(env.unqualified, false);
+  assertEq(env.lexical, true, "lexical must live in the BlockLexicalEnvironmentObject");
+  assertEq(env.prop, false);
+
+  env = envs[i]; i++;
+  assertEq(env.type, "[DebugProxy] CallObject");
+  assertEq(env.qualified, true, "qualified var must live in the CallObject");
+  assertEq(env.unqualified, false);
+  assertEq(env.lexical, false);
+  assertEq(env.prop, false);
+
+  env = envs[i]; i++;
+  assertEq(env.type, "[DebugProxy] GlobalLexicalEnvironmentObject");
+  assertEq(env.qualified, false);
+  assertEq(env.unqualified, false);
+  assertEq(env.lexical, false);
+  assertEq(env.prop, false);
+
+  env = envs[i]; i++;
+  assertEq(env.type, "*global*");
+  assertEq(env.qualified, false);
+  assertEq(env.unqualified, true, "unqualified name must live in the global");
+  assertEq(env.lexical, false);
+  assertEq(env.prop, true, "this property must live in the global");
+};
+
+g.eval(`
+function target() {
+}
+target();
+`);