feature #48802 [DependencyInjection] Cut compilation time (nicolas-grekas)

fabpot · fabpot · commit f3fc6d7b6812 · 2022-12-28T14:36:21.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [DependencyInjection] Cut compilation time | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Two more victories for Blackfire.io 🎉 First win for InlineServiceDefinitionsPass: -58% ![image](https://user-images.githubusercontent.com/243674/209802991-e985525a-4e03-4cb6-b43a-b3e7e530344a.png) Second win for `ContainerBuilder::inVendors()`: an additional -6.5% ![image](https://user-images.githubusercontent.com/243674/209803312-90a8b343-68f3-4392-b834-2fd3404cab8a.png) Confirmed -50% without Blackfire also: from 30s to 15s. Commits ------- 87cf70a [DependencyInjection] Cut compilation time
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -51,6 +51,7 @@ public function process(ContainerBuilder $container)
             $analyzedContainer = $container;
         }
         try {
+            $notInlinableIds = [];
             $remainingInlinedIds = [];
             $this->connectedIds = $this->notInlinedIds = $container->getDefinitions();
             do {
@@ -60,7 +61,8 @@ public function process(ContainerBuilder $container)
                 }
                 $this->graph = $analyzedContainer->getCompiler()->getServiceReferenceGraph();
                 $notInlinedIds = $this->notInlinedIds;
-                $this->connectedIds = $this->notInlinedIds = $this->inlinedIds = [];
+                $notInlinableIds += $this->notInlinableIds;
+                $this->connectedIds = $this->notInlinedIds = $this->inlinedIds = $this->notInlinableIds = [];
 
                 foreach ($analyzedContainer->getDefinitions() as $id => $definition) {
                     if (!$this->graph->hasNode($id)) {
@@ -86,7 +88,7 @@ public function process(ContainerBuilder $container)
             } while ($this->inlinedIds && $this->analyzingPass);
 
             foreach ($remainingInlinedIds as $id) {
-                if (isset($this->notInlinableIds[$id])) {
+                if (isset($notInlinableIds[$id])) {
                     continue;
                 }
 
@@ -126,8 +128,10 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
 
         $definition = $this->container->getDefinition($id);
 
-        if (!$this->isInlineableDefinition($id, $definition)) {
-            $this->notInlinableIds[$id] = true;
+        if (isset($this->notInlinableIds[$id]) || !$this->isInlineableDefinition($id, $definition)) {
+            if ($this->currentId !== $id) {
+                $this->notInlinableIds[$id] = true;
+            }
 
             return $value;
         }
@@ -188,7 +192,7 @@ private function isInlineableDefinition(string $id, Definition $definition): boo
             return true;
         }
 
-        if ($this->currentId == $id) {
+        if ($this->currentId === $id) {
             return false;
         }
         $this->connectedIds[$id] = true;
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -114,6 +114,11 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      */
     private array $vendors;
 
+    /**
+     * @var string[] the list of paths in vendor directories
+     */
+    private array $pathsInVendor = [];
+
     /**
      * @var array<string, ChildDefinition>
      */
@@ -1610,17 +1615,27 @@ private function getExpressionLanguage(): ExpressionLanguage
 
     private function inVendors(string $path): bool
     {
+        $path = is_file($path) ? \dirname($path) : $path;
+
+        if (isset($this->pathsInVendor[$path])) {
+            return $this->pathsInVendor[$path];
+        }
+
         $this->vendors ??= (new ComposerResource())->getVendors();
         $path = realpath($path) ?: $path;
 
+        if (isset($this->pathsInVendor[$path])) {
+            return $this->pathsInVendor[$path];
+        }
+
         foreach ($this->vendors as $vendor) {
             if (str_starts_with($path, $vendor) && false !== strpbrk(substr($path, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
                 $this->addResource(new FileResource($vendor.'/composer/installed.json'));
 
-                return true;
+                return $this->pathsInVendor[$path] = true;
             }
         }
 
-        return false;
+        return $this->pathsInVendor[$path] = false;
     }
 }
