Skip to content

deps: V8: cherry-pick c172ffc5bf54 #57437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2025
+10 −7
Merged

deps: V8: cherry-pick c172ffc5bf54 #57437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.11',
'v8_embedder_string': '-node.12',

##### V8 defaults for Node.js #####

Expand Down
13 changes: 7 additions & 6 deletions deps/v8/src/heap/heap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6356,12 +6356,13 @@ void Heap::AddRetainedMaps(DirectHandle<NativeContext> context,
GlobalHandleVector<Map> maps) {
Handle<WeakArrayList> array(Cast<WeakArrayList>(context->retained_maps()),
isolate());
if (array->IsFull()) {
int new_maps_size = static_cast<int>(maps.size()) * kRetainMapEntrySize;
if (array->length() + new_maps_size > array->capacity()) {
CompactRetainedMaps(*array);
}
int cur_length = array->length();
array = WeakArrayList::EnsureSpace(
isolate(), array, cur_length + static_cast<int>(maps.size()) * 2);
array =
WeakArrayList::EnsureSpace(isolate(), array, cur_length + new_maps_size);
if (*array != context->retained_maps()) {
context->set_retained_maps(*array);
}
Expand All @@ -6379,7 +6380,7 @@ void Heap::AddRetainedMaps(DirectHandle<NativeContext> context,
raw_array->Set(cur_length, MakeWeak(*map));
raw_array->Set(cur_length + 1,
Smi::FromInt(v8_flags.retain_maps_for_n_gc));
cur_length += 2;
cur_length += kRetainMapEntrySize;
raw_array->set_length(cur_length);

map->set_is_in_retained_map_list(true);
Expand All @@ -6391,7 +6392,7 @@ void Heap::CompactRetainedMaps(Tagged<WeakArrayList> retained_maps) {
int length = retained_maps->length();
int new_length = 0;
// This loop compacts the array by removing cleared weak cells.
for (int i = 0; i < length; i += 2) {
for (int i = 0; i < length; i += kRetainMapEntrySize) {
Tagged<MaybeObject> maybe_object = retained_maps->Get(i);
if (maybe_object.IsCleared()) {
continue;
Expand All @@ -6405,7 +6406,7 @@ void Heap::CompactRetainedMaps(Tagged<WeakArrayList> retained_maps) {
retained_maps->Set(new_length, maybe_object);
retained_maps->Set(new_length + 1, age);
}
new_length += 2;
new_length += kRetainMapEntrySize;
}
Tagged<HeapObject> undefined = ReadOnlyRoots(this).undefined_value();
for (int i = new_length; i < length; i++) {
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/src/heap/heap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,6 +1812,8 @@ class Heap final {
void AddToRingBuffer(const char* string);
void GetFromRingBuffer(char* buffer);

static constexpr int kRetainMapEntrySize = 2;

void CompactRetainedMaps(Tagged<WeakArrayList> retained_maps);

void CollectGarbageOnMemoryPressure();
Expand Down
Loading