Improve performances in CircualReference detection

jderusse · jderusse · commit bfd7d8f3ad43 · 2020-10-29T23:19:26.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -409,58 +409,66 @@ private function getProxyDumper(): ProxyDumper
         return $this->proxyDumper;
     }
 
-    private function analyzeCircularReferences(string $sourceId, array $edges, array &$checkedNodes, array &$currentPath = [], bool $byConstructor = true)
+    private function analyzeCircularReferences(string $sourceId, array $edges, array &$checkedNodes, bool $byConstructor = true)
     {
-        $checkedNodes[$sourceId] = true;
-        $currentPath[$sourceId] = $byConstructor;
+        $newNodes = [];
+        $this->collectReferences($sourceId, $edges, $checkedNodes, $newNodes);
+        $this->flattendNewReferences($checkedNodes, $newNodes);
 
+        foreach ($newNodes as $newNodeId => $_) {
+            if (isset($checkedNodes[$newNodeId][$newNodeId])) {
+                $this->addCircularReferences($newNodeId, $checkedNodes[$newNodeId][$newNodeId][0], $byConstructor && $checkedNodes[$newNodeId][$newNodeId][1]);
+            }
+        }
+    }
+
+    private function collectReferences(string $sourceId, array $edges, array &$checkedNodes, array &$newNodes)
+    {
+        $checkedNodes[$sourceId] = [];
+        $newNodes[$sourceId] = [];
         foreach ($edges as $edge) {
             $node = $edge->getDestNode();
             $id = $node->getId();
-
             if (!$node->getValue() instanceof Definition || $sourceId === $id || $edge->isLazy() || $edge->isWeak()) {
-                // no-op
-            } elseif (isset($currentPath[$id])) {
-                $this->addCircularReferences($id, $currentPath, $edge->isReferencedByConstructor());
-            } elseif (!isset($checkedNodes[$id])) {
-                $this->analyzeCircularReferences($id, $node->getOutEdges(), $checkedNodes, $currentPath, $edge->isReferencedByConstructor());
-            } elseif (isset($this->circularReferences[$id])) {
-                $this->connectCircularReferences($id, $currentPath, $edge->isReferencedByConstructor());
+                continue;
             }
-        }
-        unset($currentPath[$sourceId]);
-    }
 
-    private function connectCircularReferences(string $sourceId, array &$currentPath, bool $byConstructor, array &$subPath = [])
-    {
-        $currentPath[$sourceId] = $subPath[$sourceId] = $byConstructor;
+            if (!isset($checkedNodes[$id])) {
+                $this->collectReferences($id, $node->getOutEdges(), $checkedNodes, $newNodes);
+            }
 
-        foreach ($this->circularReferences[$sourceId] as $id => $byConstructor) {
-            if (isset($currentPath[$id])) {
-                $this->addCircularReferences($id, $currentPath, $byConstructor);
-            } elseif (!isset($subPath[$id]) && isset($this->circularReferences[$id])) {
-                $this->connectCircularReferences($id, $currentPath, $byConstructor, $subPath);
+            $checkedNodes[$sourceId][$id] = [[], $edge->isReferencedByConstructor()];
+            if (isset($newNodes[$id])) {
+                $newNodes[$id][$sourceId] = true;
             }
         }
-        unset($currentPath[$sourceId], $subPath[$sourceId]);
     }
 
-    private function addCircularReferences(string $id, array $currentPath, bool $byConstructor)
+    private function flattendNewReferences(array &$checkedNodes, array $newNodes)
     {
-        $currentPath[$id] = $byConstructor;
-        $circularRefs = [];
-
-        foreach (array_reverse($currentPath) as $parentId => $v) {
-            $byConstructor = $byConstructor && $v;
-            $circularRefs[] = $parentId;
-
-            if ($parentId === $id) {
-                break;
+        $nodesToFlatten = array_keys($newNodes);
+        do {
+            $changedNodes = [];
+            foreach ($nodesToFlatten as $newNodeId) {
+                $deps = &$checkedNodes[$newNodeId];
+                foreach ($deps as $id => [$path, $depsByConstructor]) {
+                    foreach ($checkedNodes[$id] as $depsId => [$subPath, $subDepsByConstructor]) {
+                        if (!isset($deps[$depsId]) || ($depsByConstructor && $subDepsByConstructor && !$deps[$depsId][1])) {
+                            $deps[$depsId] = [array_merge([$id], $subPath), $depsByConstructor && $subDepsByConstructor];
+                            $changedNodes += $newNodes[$newNodeId] ?? [];
+                        }
+                    }
+                }
             }
-        }
+            $nodesToFlatten = array_keys($changedNodes);
+        } while (!empty($nodesToFlatten));
+    }
 
-        $currentId = $id;
-        foreach ($circularRefs as $parentId) {
+    private function addCircularReferences(string $sourceId, array $currentPath, bool $byConstructor)
+    {
+        $currentId = $sourceId;
+        array_unshift($currentPath, $currentId);
+        foreach (array_reverse($currentPath) as $parentId) {
             if (empty($this->circularReferences[$parentId][$currentId])) {
                 $this->circularReferences[$parentId][$currentId] = $byConstructor;
             }
