Browse Source

Fix memory leak in generator functions (#21774)

Backports https://chromium-review.googlesource.com/c/v8/v8/+/1967317
Robo 5 years ago
parent
commit
dffecfaf59

+ 1 - 0
patches/common/v8/.patches

@@ -7,3 +7,4 @@ export_symbols_needed_for_windows_build.patch
 workaround_an_undefined_symbol_error.patch
 do_not_export_private_v8_symbols_on_windows.patch
 fix_crash_under_lb_lu_locale.patch
+objects_fix_memory_leak_in_prototypeusers_add.patch

+ 71 - 0
patches/common/v8/objects_fix_memory_leak_in_prototypeusers_add.patch

@@ -0,0 +1,71 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dominik=20Inf=C3=BChr?= <[email protected]>
+Date: Fri, 13 Dec 2019 14:13:21 +0100
+Subject: [objects] Fix memory leak in PrototypeUsers::Add
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+PrototypeUsers::Add now iterates the WeakArrayList to find empty slots
+before growing the array. Not reusing empty slots caused a memory leak.
+
+It might also be desirable to shrink the WeakArrayList in the future.
+Right now it is only compacted when invoking CreateBlob.
+
+Also removed unused PrototypeUsers::IsEmptySlot declaration.
+
+Bug: v8:10031
+Change-Id: I570ec78fca37e8f0c794f1f40846a4daab47c225
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1967317
+Reviewed-by: Ulan Degenbaev <[email protected]>
+Reviewed-by: Igor Sheludko <[email protected]>
+Commit-Queue: Dominik Inführ <[email protected]>
+Cr-Commit-Position: refs/heads/master@{#65456}
+
+diff --git a/src/objects/objects.cc b/src/objects/objects.cc
+index 8cc22fa0e5cfb193d6aafcea861b7a346dc0d4b6..3e685d901b4b52b8f45bbb12c6dfd71c3675746a 100644
+--- a/src/objects/objects.cc
++++ b/src/objects/objects.cc
+@@ -4017,6 +4017,13 @@ Handle<WeakArrayList> PrototypeUsers::Add(Isolate* isolate,
+ 
+   // If there are empty slots, use one of them.
+   int empty_slot = Smi::ToInt(empty_slot_index(*array));
++
++  if (empty_slot == kNoEmptySlotsMarker) {
++    // GCs might have cleared some references, rescan the array for empty slots.
++    PrototypeUsers::ScanForEmptySlots(*array);
++    empty_slot = Smi::ToInt(empty_slot_index(*array));
++  }
++
+   if (empty_slot != kNoEmptySlotsMarker) {
+     DCHECK_GE(empty_slot, kFirstIndex);
+     CHECK_LT(empty_slot, array->length());
+@@ -4039,6 +4046,15 @@ Handle<WeakArrayList> PrototypeUsers::Add(Isolate* isolate,
+   return array;
+ }
+ 
++// static
++void PrototypeUsers::ScanForEmptySlots(WeakArrayList array) {
++  for (int i = kFirstIndex; i < array.length(); i++) {
++    if (array.Get(i)->IsCleared()) {
++      PrototypeUsers::MarkSlotEmpty(array, i);
++    }
++  }
++}
++
+ WeakArrayList PrototypeUsers::Compact(Handle<WeakArrayList> array, Heap* heap,
+                                       CompactionCallback callback,
+                                       AllocationType allocation) {
+diff --git a/src/objects/prototype-info.h b/src/objects/prototype-info.h
+index 94d86d2e1931c397f683c0824dd05dab6a9963c3..6f777eda8936c81a139a80d8be71258f1181ce8d 100644
+--- a/src/objects/prototype-info.h
++++ b/src/objects/prototype-info.h
+@@ -99,7 +99,7 @@ class V8_EXPORT_PRIVATE PrototypeUsers : public WeakArrayList {
+   static inline Smi empty_slot_index(WeakArrayList array);
+   static inline void set_empty_slot_index(WeakArrayList array, int index);
+ 
+-  static void IsSlotEmpty(WeakArrayList array, int index);
++  static void ScanForEmptySlots(WeakArrayList array);
+ 
+   DISALLOW_IMPLICIT_CONSTRUCTORS(PrototypeUsers);
+ };