Title: [225734] trunk/Source/_javascript_Core
Revision
225734
Author
[email protected]
Date
2017-12-10 17:10:32 -0800 (Sun, 10 Dec 2017)

Log Message

Harden a few assertions in GC sweep
https://bugs.webkit.org/show_bug.cgi?id=180634

Reviewed by Saam Barati.
        
This turns one dynamic check into a release assertion and upgrades another assertion to a release
assertion.

* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::Handle::sweep):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (225733 => 225734)


--- trunk/Source/_javascript_Core/ChangeLog	2017-12-10 21:11:18 UTC (rev 225733)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-12-11 01:10:32 UTC (rev 225734)
@@ -1,3 +1,16 @@
+2017-12-10  Filip Pizlo  <[email protected]>
+
+        Harden a few assertions in GC sweep
+        https://bugs.webkit.org/show_bug.cgi?id=180634
+
+        Reviewed by Saam Barati.
+        
+        This turns one dynamic check into a release assertion and upgrades another assertion to a release
+        assertion.
+
+        * heap/MarkedBlock.cpp:
+        (JSC::MarkedBlock::Handle::sweep):
+
 2017-12-10  Konstantin Tokarev  <[email protected]>
 
         [python] Modernize "except" usage for python3 compatibility

Modified: trunk/Source/_javascript_Core/heap/MarkedBlock.cpp (225733 => 225734)


--- trunk/Source/_javascript_Core/heap/MarkedBlock.cpp	2017-12-10 21:11:18 UTC (rev 225733)
+++ trunk/Source/_javascript_Core/heap/MarkedBlock.cpp	2017-12-11 01:10:32 UTC (rev 225734)
@@ -402,13 +402,9 @@
     if (sweepMode == SweepOnly && !needsDestruction)
         return;
 
-    if (UNLIKELY(m_isFreeListed)) {
-        RELEASE_ASSERT(sweepMode == SweepToFreeList);
-        return;
-    }
+    RELEASE_ASSERT(!m_isFreeListed);
+    RELEASE_ASSERT(!m_allocator->isAllocated(NoLockingNecessary, this));
     
-    ASSERT(!m_allocator->isAllocated(NoLockingNecessary, this));
-    
     if (space()->isMarking())
         block().m_lock.lock();
     
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to