From 23d0c22cdb036c43b990645f92cbe14aa0a45678 Mon Sep 17 00:00:00 2001 From: legendecas Date: Thu, 7 Apr 2022 14:26:58 +0800 Subject: [PATCH] deps: backport v8 367b0c1e --- deps/v8/src/codegen/code-stub-assembler.cc | 3 +-- deps/v8/test/cctest/test-code-stub-assembler.cc | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deps/v8/src/codegen/code-stub-assembler.cc b/deps/v8/src/codegen/code-stub-assembler.cc index 843d1e39ac984f..89e6c960c1b324 100644 --- a/deps/v8/src/codegen/code-stub-assembler.cc +++ b/deps/v8/src/codegen/code-stub-assembler.cc @@ -13088,8 +13088,7 @@ void CodeStubAssembler::InitializeSyntheticFunctionContext( SmiConstant(slots)); TNode context = CAST(context_heap_object); - const TNode empty_scope_info = - LoadContextElement(native_context, Context::SCOPE_INFO_INDEX); + const TNode empty_scope_info = LoadRoot(RootIndex::kEmptyScopeInfo); StoreContextElementNoWriteBarrier(context, Context::SCOPE_INFO_INDEX, empty_scope_info); StoreContextElementNoWriteBarrier(context, Context::PREVIOUS_INDEX, diff --git a/deps/v8/test/cctest/test-code-stub-assembler.cc b/deps/v8/test/cctest/test-code-stub-assembler.cc index f9b92207a0c248..30d3e0f00e4e03 100644 --- a/deps/v8/test/cctest/test-code-stub-assembler.cc +++ b/deps/v8/test/cctest/test-code-stub-assembler.cc @@ -2566,7 +2566,7 @@ TEST(CreatePromiseResolvingFunctionsContext) { ft.Call(isolate->factory()->undefined_value()).ToHandleChecked(); CHECK(result->IsContext()); Handle context_js = Handle::cast(result); - CHECK_EQ(isolate->native_context()->scope_info(), context_js->scope_info()); + CHECK_EQ(isolate->root(RootIndex::kEmptyScopeInfo), context_js->scope_info()); CHECK_EQ(*isolate->native_context(), context_js->native_context()); CHECK(context_js->get(PromiseBuiltins::kPromiseSlot).IsJSPromise()); CHECK_EQ(ReadOnlyRoots(isolate).false_value(), @@ -2724,7 +2724,7 @@ TEST(CreatePromiseGetCapabilitiesExecutorContext) { CHECK(result_obj->IsContext()); Handle context_js = Handle::cast(result_obj); CHECK_EQ(PromiseBuiltins::kCapabilitiesContextLength, context_js->length()); - CHECK_EQ(isolate->native_context()->scope_info(), context_js->scope_info()); + CHECK_EQ(isolate->root(RootIndex::kEmptyScopeInfo), context_js->scope_info()); CHECK_EQ(*isolate->native_context(), context_js->native_context()); CHECK( context_js->get(PromiseBuiltins::kCapabilitySlot).IsPromiseCapability()); @@ -2773,7 +2773,8 @@ TEST(NewPromiseCapability) { for (auto&& callback : callbacks) { Handle context(Context::cast(callback->context()), isolate); - CHECK_EQ(isolate->native_context()->scope_info(), context->scope_info()); + CHECK_EQ(isolate->root(RootIndex::kEmptyScopeInfo), + context->scope_info()); CHECK_EQ(*isolate->native_context(), context->native_context()); CHECK_EQ(PromiseBuiltins::kPromiseContextLength, context->length()); CHECK_EQ(context->get(PromiseBuiltins::kPromiseSlot), result->promise());