danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Don’t copy context unnecessarily when checking methods had no effect

Browse Source
This commit is contained in:
Brown 2019-01-31 12:55:48 -05:00
parent 2054e3753f
commit 74ebb0b2d5
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Psalm/Context.php
View File

@ -716,4 +716,16 @@ class Context
return isset($this->vars_in_scope[$var_name]);
}
public function getScopeSummary() : string
{
$summary = [];
foreach ($this->vars_possibly_in_scope as $k => $_) {
$summary[$k] = true;
}
foreach ($this->vars_in_scope as $k => $v) {
$summary[$k] = $v->getId();
}
return json_encode($summary);
}
}

22
src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
View File

@ -74,7 +74,7 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer implements Statements
private $local_return_type;
/**
* @var array<string, array>
* @var array<string, bool>
*/
protected static $no_effects_hashes = [];
@ -141,18 +141,10 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer implements Statements
$method_id = (string)$this->getMethodId($context->self);
if ($add_mutations) {
$hash = $real_method_id . json_encode([
$context->vars_in_scope,
$context->vars_possibly_in_scope,
]);
$hash = md5($real_method_id . '::' . $context->getScopeSummary());
// if we know that the function has no effects on vars, we don't bother rechecking
if (isset(self::$no_effects_hashes[$hash])) {
list(
$context->vars_in_scope,
$context->vars_possibly_in_scope
) = self::$no_effects_hashes[$hash];
return null;
}
} elseif ($context->self) {
@ -790,16 +782,10 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer implements Statements
}
if ($hash && $real_method_id && $this instanceof MethodAnalyzer) {
$new_hash = $real_method_id . json_encode([
$context->vars_in_scope,
$context->vars_possibly_in_scope,
]);
$new_hash = md5($real_method_id . '::' . $context->getScopeSummary());
if ($new_hash === $hash) {
self::$no_effects_hashes[$hash] = [
$context->vars_in_scope,
$context->vars_possibly_in_scope,
];
self::$no_effects_hashes[$hash] = true;
}
}
}