Skip to content

Commit e6f45bf

Browse files
targosnodejs-github-bot
authored andcommitted
src: stop using removed FixedArray::Get overload
Refs: https://chromium-review.googlesource.com/c/v8/v8/+/7456554
1 parent 8f24182 commit e6f45bf

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

src/module_wrap.cc

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ std::string ModuleCacheKey::ToString() const {
9696
}
9797

9898
template <int elements_per_attribute>
99-
ModuleCacheKey ModuleCacheKey::From(Local<Context> context,
100-
Local<String> specifier,
99+
ModuleCacheKey ModuleCacheKey::From(Local<String> specifier,
101100
Local<FixedArray> import_attributes) {
102101
CHECK_EQ(import_attributes->Length() % elements_per_attribute, 0);
103102
Isolate* isolate = Isolate::GetCurrent();
@@ -110,8 +109,8 @@ ModuleCacheKey ModuleCacheKey::From(Local<Context> context,
110109

111110
for (int i = 0; i < import_attributes->Length();
112111
i += elements_per_attribute) {
113-
DCHECK(DataIsString(import_attributes->Get(context, i)));
114-
DCHECK(DataIsString(import_attributes->Get(context, i + 1)));
112+
DCHECK(DataIsString(import_attributes->Get(i)));
113+
DCHECK(DataIsString(import_attributes->Get(i + 1)));
115114

116115
Local<String> v8_key = import_attributes->Get(i).As<String>();
117116
Local<String> v8_value = import_attributes->Get(i + 1).As<String>();
@@ -131,10 +130,8 @@ ModuleCacheKey ModuleCacheKey::From(Local<Context> context,
131130
return ModuleCacheKey{utf8_specifier.ToString(), attributes, hash};
132131
}
133132

134-
ModuleCacheKey ModuleCacheKey::From(Local<Context> context,
135-
Local<ModuleRequest> v8_request) {
136-
return From(
137-
context, v8_request->GetSpecifier(), v8_request->GetImportAttributes());
133+
ModuleCacheKey ModuleCacheKey::From(Local<ModuleRequest> v8_request) {
134+
return From(v8_request->GetSpecifier(), v8_request->GetImportAttributes());
138135
}
139136

140137
ModuleWrap::ModuleWrap(Realm* realm,
@@ -570,7 +567,7 @@ static Local<Array> createModuleRequestsContainer(
570567
LocalVector<Value> requests(isolate, raw_requests->Length());
571568

572569
for (int i = 0; i < raw_requests->Length(); i++) {
573-
DCHECK(raw_requests->Get(context, i)->IsModuleRequest());
570+
DCHECK(raw_requests->Get(i)->IsModuleRequest());
574571
Local<ModuleRequest> module_request =
575572
raw_requests->Get(i).As<ModuleRequest>();
576573

@@ -661,7 +658,7 @@ void ModuleWrap::Link(const FunctionCallbackInfo<Value>& args) {
661658
// This currently doesn't sort the import attributes.
662659
Local<Value> module_value = modules_vector[i].Get(isolate);
663660
ModuleCacheKey module_cache_key =
664-
ModuleCacheKey::From(context, requests->Get(i).As<ModuleRequest>());
661+
ModuleCacheKey::From(requests->Get(i).As<ModuleRequest>());
665662
auto it = module_request_map.find(module_cache_key);
666663
if (it == module_request_map.end()) {
667664
// This is the first request with this identity, record it - any mismatch

src/module_wrap.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,9 @@ struct ModuleCacheKey : public MemoryRetainer {
6363
std::string ToString() const;
6464

6565
template <int elements_per_attribute = 3>
66-
static ModuleCacheKey From(v8::Local<v8::Context> context,
67-
v8::Local<v8::String> specifier,
66+
static ModuleCacheKey From(v8::Local<v8::String> specifier,
6867
v8::Local<v8::FixedArray> import_attributes);
69-
static ModuleCacheKey From(v8::Local<v8::Context> context,
70-
v8::Local<v8::ModuleRequest> v8_request);
68+
static ModuleCacheKey From(v8::Local<v8::ModuleRequest> v8_request);
7169

7270
struct Hash {
7371
std::size_t operator()(const ModuleCacheKey& request) const {

0 commit comments

Comments
 (0)