Merge pull request #9326 from vimeo/prevent-jit-warnings

vimeo · Feb 18, 2023 · 5fe902b · 5fe902b
2 parents 95877a0 + 4d871fd
commit 5fe902b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/src/Psalm/Internal/Cli/LanguageServer.php b/src/Psalm/Internal/Cli/LanguageServer.php
@@ -237,7 +237,13 @@ static function (string $arg) use ($valid_long_options): void {
 
         $ini_handler = new PsalmRestarter('PSALM');
 
-        $ini_handler->disableExtension('grpc');
+        $ini_handler->disableExtensions([
+            'grpc',
+            'uopz',
+            // extensions bellow are incompatible with JIT
+            'pcov',
+            'blackfire',
+        ]);
 
         // If Xdebug is enabled, restart without it
         $ini_handler->check();

diff --git a/src/Psalm/Internal/Cli/Psalm.php b/src/Psalm/Internal/Cli/Psalm.php
@@ -903,7 +903,12 @@ private static function restart(array $options, int $threads, Progress $progress
             $ini_handler->disableExtension('grpc');
         }
 
-        $ini_handler->disableExtension('uopz');
+        $ini_handler->disableExtensions([
+            'uopz',
+            // extesions that are incompatible with JIT (they are also usually make Psalm slow)
+            'pcov',
+            'blackfire',
+        ]);
 
         // If Xdebug is enabled, restart without it
         $ini_handler->check();

diff --git a/src/Psalm/Internal/Cli/Psalter.php b/src/Psalm/Internal/Cli/Psalter.php
@@ -3,13 +3,13 @@
 namespace Psalm\Internal\Cli;
 
 use AssertionError;
-use Composer\XdebugHandler\XdebugHandler;
 use Psalm\Config;
 use Psalm\Exception\UnsupportedIssueToFixException;
 use Psalm\Internal\Analyzer\ProjectAnalyzer;
 use Psalm\Internal\CliUtils;
 use Psalm\Internal\Composer;
 use Psalm\Internal\ErrorHandler;
+use Psalm\Internal\Fork\PsalmRestarter;
 use Psalm\Internal\IncludeCollector;
 use Psalm\Internal\Provider\ClassLikeStorageCacheProvider;
 use Psalm\Internal\Provider\FileProvider;
@@ -218,10 +218,16 @@ public static function run(array $argv): void
             static fn(): ?\Composer\Autoload\ClassLoader =>
                 CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir)
         );
-
+        $ini_handler = new PsalmRestarter('PSALTER');
+        $ini_handler->disableExtensions([
+            'grpc',
+            'uopz',
+            'pcov',
+            'blackfire',
+        ]);
 
         // If Xdebug is enabled, restart without it
-        (new XdebugHandler('PSALTER'))->check();
+        $ini_handler->check();
 
         $paths_to_check = CliUtils::getPathsToCheck($options['f'] ?? null);
 

diff --git a/src/Psalm/Internal/Fork/PsalmRestarter.php b/src/Psalm/Internal/Fork/PsalmRestarter.php
@@ -5,6 +5,7 @@
 use Composer\XdebugHandler\XdebugHandler;
 
 use function array_filter;
+use function array_merge;
 use function array_splice;
 use function extension_loaded;
 use function file_get_contents;
@@ -26,11 +27,17 @@ class PsalmRestarter extends XdebugHandler
     /**
      * @var string[]
      */
-    private array $disabledExtensions = [];
+    private array $disabled_extensions = [];
 
-    public function disableExtension(string $disabledExtension): void
+    public function disableExtension(string $disabled_extension): void
     {
-        $this->disabledExtensions[] = $disabledExtension;
+        $this->disabled_extensions[] = $disabled_extension;
+    }
+
+    /** @param list<non-empty-string> $disable_extensions */
+    public function disableExtensions(array $disable_extensions): void
+    {
+        $this->disabled_extensions = array_merge($this->disabled_extensions, $disable_extensions);
     }
 
     /**
@@ -42,7 +49,7 @@ public function disableExtension(string $disabledExtension): void
     protected function requiresRestart($default): bool
     {
         $this->required = (bool) array_filter(
-            $this->disabledExtensions,
+            $this->disabled_extensions,
             static fn(string $extension): bool => extension_loaded($extension)
         );
 
@@ -72,7 +79,7 @@ protected function requiresRestart($default): bool
     protected function restart(array $command): void
     {
         if ($this->required && $this->tmpIni) {
-            $regex = '/^\s*(extension\s*=.*(' . implode('|', $this->disabledExtensions) . ').*)$/mi';
+            $regex = '/^\s*(extension\s*=.*(' . implode('|', $this->disabled_extensions) . ').*)$/mi';
             $content = file_get_contents($this->tmpIni);
 
             $content = preg_replace($regex, ';$1', $content);