Changeset 226725 in webkit for trunk/Source/JavaScriptCore/heap/HeapUtil.h

Timestamp:

Jan 10, 2018, 11:41:12 AM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r226667 and r226673.
​https://bugs.webkit.org/show_bug.cgi?id=181488

This caused a flaky crash. (Requested by mlewis13 on #webkit).

Reverted changesets:

"CodeBlocks should be in IsoSubspaces"
​https://bugs.webkit.org/show_bug.cgi?id=180884
​https://trac.webkit.org/changeset/226667

"REGRESSION (r226667): CodeBlocks should be in IsoSubspaces"
​https://bugs.webkit.org/show_bug.cgi?id=180884
​https://trac.webkit.org/changeset/226673

File:

• trunk/Source/JavaScriptCore/heap/HeapUtil.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/heap/HeapUtil.h

@@ -67 +67 @@
                     [] (LargeAllocation** ptr) -> LargeAllocation* { return *ptr; });
                 if (result) {
-                    auto attemptLarge = [&] (LargeAllocation* allocation) {
-                        if (allocation->contains(pointer))
-                            func(allocation->cell(), allocation->attributes().cellKind);
-                    };
-                    
-                    if (result > heap.objectSpace().largeAllocationsForThisCollectionBegin())
-                        attemptLarge(result[-1]);
-                    attemptLarge(result[0]);
-                    if (result + 1 < heap.objectSpace().largeAllocationsForThisCollectionEnd())
-                        attemptLarge(result[1]);
+                    if (result > heap.objectSpace().largeAllocationsForThisCollectionBegin()
+                        && result[-1]->contains(pointer))
+                        func(result[-1]->cell());
+                    if (result[0]->contains(pointer))
+                        func(result[0]->cell());
+                    if (result + 1 < heap.objectSpace().largeAllocationsForThisCollectionEnd()
+                        && result[1]->contains(pointer))
+                        func(result[1]->cell());
                 }
             }
@@ -92 +90 @@
                 previousPointer = static_cast<char*>(previousCandidate->handle().cellAlign(previousPointer));
                 if (previousCandidate->handle().isLiveCell(markingVersion, newlyAllocatedVersion, isMarking, previousPointer))
-                    func(previousPointer, previousCandidate->handle().cellKind());
+                    func(previousPointer);
             }
         }
@@ -103 +101 @@
         if (!set.contains(candidate))
             return;
-
-        HeapCell::Kind cellKind = candidate->handle().cellKind();
         
         auto tryPointer = [&] (void* pointer) {
             if (candidate->handle().isLiveCell(markingVersion, newlyAllocatedVersion, isMarking, pointer))
-                func(pointer, cellKind);
+                func(pointer);
         };