[context] Call correct load for lex var in LoadGlobalIC

victorgomes · V8 LUCI CQ · commit 380621f463fd · 2025-03-10T07:58:41.000-07:00
Fixed: 401652934 Change-Id: Id6cf4212dad9974225da1d0549a213ce3e4492af Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6330273 Reviewed-by: Igor Sheludko <ishell@chromium.org> Commit-Queue: Igor Sheludko <ishell@chromium.org> Auto-Submit: Victor Gomes <victorgomes@chromium.org> Cr-Commit-Position: refs/heads/main@{#99151}
diff --git a/src/ic/accessor-assembler.cc b/src/ic/accessor-assembler.cc
@@ -3500,7 +3500,7 @@ void AccessorAssembler::LoadGlobalIC_TryPropertyCellCase(
         Signed(DecodeWord<FeedbackNexus::SlotIndexBits>(lexical_handler));
     TNode<Context> context = lazy_context();
     TNode<Context> script_context = LoadScriptContext(context, context_index);
-    TNode<Object> result = LoadContextElement(script_context, slot_index);
+    TNode<Object> result = LoadScriptContextElement(script_context, slot_index);
     exit_point->Return(result);
   }
 }
diff --git a/test/mjsunit/regress-401652934-2.js b/test/mjsunit/regress-401652934-2.js
@@ -0,0 +1,7 @@
+// Copyright 2025 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+function checkTestVar() {
+  assertEquals(0, testVar);
+}
diff --git a/test/mjsunit/regress-401652934.js b/test/mjsunit/regress-401652934.js
@@ -0,0 +1,13 @@
+// Copyright 2025 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-lazy-feedback-allocation
+
+load("test/mjsunit/regress-401652934-2.js")
+
+let testVar;
+testVar = 0 * Math.PI;
+
+checkTestVar();
+checkTestVar();

Original file line number	Diff line number	Diff line change
`@@ -3500,7 +3500,7 @@ void AccessorAssembler::LoadGlobalIC_TryPropertyCellCase(`
`3500`	`3500`	`Signed(DecodeWord<FeedbackNexus::SlotIndexBits>(lexical_handler));`
`3501`	`3501`	`TNode<Context> context = lazy_context();`
`3502`	`3502`	`TNode<Context> script_context = LoadScriptContext(context, context_index);`
`3503`		`- TNode<Object> result = LoadContextElement(script_context, slot_index);`
	`3503`	`+ TNode<Object> result = LoadScriptContextElement(script_context, slot_index);`
`3504`	`3504`	`exit_point->Return(result);`
`3505`	`3505`	`}`
`3506`	`3506`	`}`