feat[tool]: separate import resolution pass

vyper/compiler/output.py

@@ -76,7 +76,7 @@ def build_archive_b64(compiler_data: CompilerData) -> str:
 
 
 def build_integrity(compiler_data: CompilerData) -> str:
-    return compiler_data.compilation_target._metadata["type"].integrity_sum
+    return compiler_data.resolved_imports.integrity_sum
 
 
 def build_external_interface_output(compiler_data: CompilerData) -> str:

vyper/compiler/output_bundle.py

@@ -12,7 +12,7 @@
 from vyper.compiler.phases import CompilerData
 from vyper.compiler.settings import Settings
 from vyper.exceptions import CompilerPanic
-from vyper.semantics.analysis.module import _is_builtin
+from vyper.semantics.analysis.imports import _is_builtin
 from vyper.utils import get_long_version
 
 # data structures and routines for constructing "output bundles",
@@ -159,7 +159,7 @@ def write(self):
         self.write_compilation_target([self.bundle.compilation_target_path])
         self.write_search_paths(self.bundle.used_search_paths)
         self.write_settings(self.compiler_data.original_settings)
-        self.write_integrity(self.bundle.compilation_target.integrity_sum)
+        self.write_integrity(self.compiler_data.resolved_imports.integrity_sum)
         self.write_sources(self.bundle.compiler_inputs)
 
 

vyper/compiler/phases.py

@@ -13,6 +13,7 @@
 from vyper.ir import compile_ir, optimizer
 from vyper.semantics import analyze_module, set_data_positions, validate_compilation_target
 from vyper.semantics.analysis.data_positions import generate_layout_export
+from vyper.semantics.analysis.imports import resolve_imports
 from vyper.semantics.types.function import ContractFunctionT
 from vyper.semantics.types.module import ModuleT
 from vyper.typing import StorageLayout
@@ -145,9 +146,20 @@ def vyper_module(self):
         _, ast = self._generate_ast
         return ast
 
+    @cached_property
+    def _resolve_imports(self):
+        vyper_module = copy.deepcopy(self.vyper_module)
+        with self.input_bundle.search_path(Path(vyper_module.resolved_path).parent):
+            return vyper_module, resolve_imports(vyper_module, self.input_bundle)
+
+    @cached_property
+    def resolved_imports(self):
+        return self._resolve_imports[1]
+
     @cached_property
     def _annotate(self) -> tuple[natspec.NatspecOutput, vy_ast.Module]:
-        module = generate_annotated_ast(self.vyper_module, self.input_bundle)
+        module = self._resolve_imports[0]
+        analyze_module(module)
         nspec = natspec.parse_natspec(module)
         return nspec, module
 
@@ -267,28 +279,6 @@ def blueprint_bytecode(self) -> bytes:
         return deploy_bytecode + blueprint_bytecode
 
 
-def generate_annotated_ast(vyper_module: vy_ast.Module, input_bundle: InputBundle) -> vy_ast.Module:
-    """
-    Validates and annotates the Vyper AST.
-
-    Arguments
-    ---------
-    vyper_module : vy_ast.Module
-        Top-level Vyper AST node
-
-    Returns
-    -------
-    vy_ast.Module
-        Annotated Vyper AST
-    """
-    vyper_module = copy.deepcopy(vyper_module)
-    with input_bundle.search_path(Path(vyper_module.resolved_path).parent):
-        # note: analyze_module does type inference on the AST
-        analyze_module(vyper_module, input_bundle)
-
-    return vyper_module
-
-
 def generate_ir_nodes(global_ctx: ModuleT, settings: Settings) -> tuple[IRnode, IRnode]:
     """
     Generate the intermediate representation (IR) from the contextualized AST.

vyper/semantics/analysis/base.py

@@ -1,7 +1,7 @@
 import enum
 from dataclasses import dataclass
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, ClassVar, Dict, Optional, Union
+from typing import TYPE_CHECKING, Any, ClassVar, Dict, Optional
 
 from vyper import ast as vy_ast
 from vyper.compiler.input_bundle import CompilerInput
@@ -13,7 +13,7 @@
 
 if TYPE_CHECKING:
     from vyper.semantics.types.function import ContractFunctionT
-    from vyper.semantics.types.module import InterfaceT, ModuleT
+    from vyper.semantics.types.module import ModuleT
 
 
 class FunctionVisibility(StringEnum):
@@ -119,13 +119,19 @@ def __hash__(self):
         return hash(id(self.module_t))
 
 
-@dataclass(frozen=True)
+@dataclass
 class ImportInfo(AnalysisResult):
-    typ: Union[ModuleInfo, "InterfaceT"]
     alias: str  # the name in the namespace
     qualified_module_name: str  # for error messages
     compiler_input: CompilerInput  # to recover file info for ast export
-    node: vy_ast.VyperNode
+    parsed: Any  # (json) abi | AST
+    _typ: Any = None  # type to be filled in during analysis
+
+    @property
+    def typ(self):
+        if self._typ is None:  # pragma: nocover
+            raise CompilerPanic("unreachable!")
+        return self._typ
 
     def to_dict(self):
         ret = {"alias": self.alias, "qualified_module_name": self.qualified_module_name}