From 2cb4d2ee571b91ec2480d2fba17e600a3843ddba Mon Sep 17 00:00:00 2001
From: win7-7 <win7-7@users.noreply.github.com>
Date: Mon, 29 Apr 2019 12:02:24 +0300
Subject: Improve dead compartment collection js/src/gc

---
 js/src/gc/Zone.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'js/src/gc/Zone.h')

diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h
index 50d06319d..24f4648f7 100644
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -349,10 +349,17 @@ struct Zone : public JS::shadow::Zone,
     // Keep track of all TypeDescr and related objects in this compartment.
     // This is used by the GC to trace them all first when compacting, since the
     // TypedObject trace hook may access these objects.
-    using TypeDescrObjectSet = js::GCHashSet<js::HeapPtr<JSObject*>,
-                                             js::MovableCellHasher<js::HeapPtr<JSObject*>>,
+	
+	 //
+	 // There are no barriers here - the set contains only tenured objects so no
+	 // post-barrier is required, and these are weak references so no pre-barrier
+	 // is required.
+    using TypeDescrObjectSet = js::GCHashSet<JSObject*,
+                                             js::MovableCellHasher<JSObject*>,
                                              js::SystemAllocPolicy>;
     JS::WeakCache<TypeDescrObjectSet> typeDescrObjects;
+	
+	bool addTypeDescrObject(JSContext* cx, HandleObject obj);
 
 
     // Malloc counter to measure memory pressure for GC scheduling. It runs from
@@ -734,4 +741,4 @@ class ZoneAllocPolicy
 
 } // namespace js
 
-#endif // gc_Zone_h
+#endif // gc_Zone_h
\ No newline at end of file
-- 
cgit v1.2.3