Changeset 225368 in webkit for trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp

Timestamp:

Nov 30, 2017, 4:14:34 PM (7 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r225362.
​https://bugs.webkit.org/show_bug.cgi?id=180225

removeIf predicate function can touch remove target set
(Requested by yusukesuzuki on #webkit).

Reverted changeset:

"[JSC] Remove easy toRemove & map.remove() use"
​https://bugs.webkit.org/show_bug.cgi?id=180208
​https://trac.webkit.org/changeset/225362

File:

• trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp

@@ -508 +508 @@
     void pruneByLiveness(const NodeSet& live)
     {
-        m_pointers.removeIf(
-            [&] (const auto& entry) {
-                return !live.contains(entry.key);
-            });
+        Vector<Node*> toRemove;
+        for (const auto& entry : m_pointers) {
+            if (!live.contains(entry.key))
+                toRemove.append(entry.key);
+        }
+        for (Node* node : toRemove)
+            m_pointers.remove(node);
+
         prune();
     }
@@ -679 +683 @@
 
         // Remove unreachable allocations
-        m_allocations.removeIf(
-            [&] (const auto& entry) {
-                return !reachable.contains(entry.key);
-            });
+        {
+            Vector<Node*> toRemove;
+            for (const auto& entry : m_allocations) {
+                if (!reachable.contains(entry.key))
+                    toRemove.append(entry.key);
+            }
+            for (Node* identifier : toRemove)
+                m_allocations.remove(identifier);
+        }
     }
 
@@ -1241 +1250 @@
         // We don't create materializations if the escapee is not a
         // sink candidate
-        escapees.removeIf(
-            [&] (const auto& entry) {
-                return !m_sinkCandidates.contains(entry.key);
-            });
+        Vector<Node*> toRemove;
+        for (const auto& entry : escapees) {
+            if (!m_sinkCandidates.contains(entry.key))
+                toRemove.append(entry.key);
+        }
+        for (Node* identifier : toRemove)
+            escapees.remove(identifier);
+
         if (escapees.isEmpty())
             return;