GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Revert "deps: backport e093a04, 09db540 from upstream V8" · nodejs/node@751f1ac

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • deps/v8
    • src
      • heap
        • mark-compact.cc
        • mark-compact.h
      • objects.cc
    • test/cctest
      • test-weakmaps.cc
      • test-weaksets.cc
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎deps/v8/src/heap/mark-compact.cc‎

Copy file name to clipboardExpand all lines: deps/v8/src/heap/mark-compact.cc
-7Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2614,13 +2614,6 @@ void MarkCompactCollector::ClearWeakCollections() {
26142614
table->RemoveEntry(i);
26152615
}
26162616
}
2617-
// Rehash if more than 25% of the entries are deleted entries.
2618-
// TODO(jochen): Consider to shrink the fixed array in place.
2619-
if ((table->NumberOfDeletedElements() << kJSWeakCollectionLoadFactorExp) >
2620-
table->NumberOfElements()) {
2621-
HandleScope scope(heap()->isolate());
2622-
table->Rehash(heap()->isolate()->factory()->undefined_value());
2623-
}
26242617
}
26252618
weak_collection_obj = weak_collection->next();
26262619
weak_collection->set_next(heap()->undefined_value());
Collapse file

‎deps/v8/src/heap/mark-compact.h‎

Copy file name to clipboardExpand all lines: deps/v8/src/heap/mark-compact.h
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -612,10 +612,6 @@ class MarkCompactCollector {
612612
static const uint32_t kSingleFreeEncoding = 0;
613613
static const uint32_t kMultiFreeEncoding = 1;
614614

615-
// If the number of deleted slots in a JSWeakCollection exceeds the number
616-
// of entries / 2^(factor), we rehash the table.
617-
static const int kJSWeakCollectionLoadFactorExp = 1;
618-
619615
static inline bool IsMarked(Object* obj);
620616
static bool IsUnmarkedHeapObjectWithHeap(Heap* heap, Object** p);
621617

Collapse file

‎deps/v8/src/objects.cc‎

Copy file name to clipboardExpand all lines: deps/v8/src/objects.cc
-26Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13744,16 +13744,6 @@ void HashTable<Derived, Shape, Key>::Rehash(Key key) {
1374413744
}
1374513745
}
1374613746
}
13747-
// Wipe deleted entries.
13748-
Heap* heap = GetHeap();
13749-
Object* the_hole = heap->the_hole_value();
13750-
Object* undefined = heap->undefined_value();
13751-
for (uint32_t current = 0; current < capacity; current++) {
13752-
if (get(EntryToIndex(current)) == the_hole) {
13753-
set(EntryToIndex(current), undefined);
13754-
}
13755-
}
13756-
SetNumberOfDeletedElements(0);
1375713747
}
1375813748

1375913749

@@ -14677,7 +14667,6 @@ Handle<CompilationCacheTable> CompilationCacheTable::PutRegExp(
1467714667
void CompilationCacheTable::Age() {
1467814668
DisallowHeapAllocation no_allocation;
1467914669
Object* the_hole_value = GetHeap()->the_hole_value();
14680-
uint32_t capacity = Capacity();
1468114670
for (int entry = 0, size = Capacity(); entry < size; entry++) {
1468214671
int entry_index = EntryToIndex(entry);
1468314672
int value_index = entry_index + 1;
@@ -14701,16 +14690,6 @@ void CompilationCacheTable::Age() {
1470114690
}
1470214691
}
1470314692
}
14704-
// Wipe deleted entries.
14705-
Heap* heap = GetHeap();
14706-
Object* the_hole = heap->the_hole_value();
14707-
Object* undefined = heap->undefined_value();
14708-
for (uint32_t current = 0; current < capacity; current++) {
14709-
if (get(EntryToIndex(current)) == the_hole) {
14710-
set(EntryToIndex(current), undefined);
14711-
}
14712-
}
14713-
SetNumberOfDeletedElements(0);
1471414693
}
1471514694

1471614695

@@ -15219,11 +15198,6 @@ Handle<ObjectHashTable> ObjectHashTable::Put(Handle<ObjectHashTable> table,
1521915198
return table;
1522015199
}
1522115200

15222-
// Rehash if more than 25% of the entries are deleted entries.
15223-
// TODO(jochen): Consider to shrink the fixed array in place.
15224-
if ((table->NumberOfDeletedElements() << 1) > table->NumberOfElements()) {
15225-
table->Rehash(isolate->factory()->undefined_value());
15226-
}
1522715201
// If we're out of luck, we didn't get a GC recently, and so rehashing
1522815202
// isn't enough to avoid a crash.
1522915203
if (!table->HasSufficientCapacityToAdd(1)) {
Collapse file

‎deps/v8/test/cctest/test-weakmaps.cc‎

Copy file name to clipboardExpand all lines: deps/v8/test/cctest/test-weakmaps.cc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ TEST(Weakness) {
123123
heap->CollectAllGarbage(false);
124124
CHECK_EQ(1, NumberOfWeakCalls);
125125
CHECK_EQ(0, ObjectHashTable::cast(weakmap->table())->NumberOfElements());
126-
CHECK_EQ(0,
126+
CHECK_EQ(2,
127127
ObjectHashTable::cast(weakmap->table())->NumberOfDeletedElements());
128128
}
129129

Collapse file

‎deps/v8/test/cctest/test-weaksets.cc‎

Copy file name to clipboardExpand all lines: deps/v8/test/cctest/test-weaksets.cc
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ TEST(WeakSet_Weakness) {
122122
heap->CollectAllGarbage(false);
123123
CHECK_EQ(1, NumberOfWeakCalls);
124124
CHECK_EQ(0, ObjectHashTable::cast(weakset->table())->NumberOfElements());
125-
CHECK_EQ(0,
126-
ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements());
125+
CHECK_EQ(
126+
1, ObjectHashTable::cast(weakset->table())->NumberOfDeletedElements());
127127
}
128128

129129

0 commit comments

Comments
0 (0)
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.