Reorder semantic passes

Compute linearisations before resolving references

Author: ggiraldez

crates/solidity-v2/outputs/cargo/semantic/src/context/mod.rs

@@ -10,8 +10,8 @@ use slang_solidity_v2_ir::ir;
 
 use crate::binder::{Binder, Definition, Reference};
 use crate::passes::{
-    p1_collect_definitions, p2_linearise_contracts, p3_type_definitions, p4_resolve_references,
-    p5_compute_linearisations,
+    p1_collect_definitions, p2_linearise_contracts, p3_type_definitions, p4_compute_linearisations,
+    p5_resolve_references,
 };
 use crate::types::{
     ArrayType, ByteArrayType, ContractType, EnumType, FixedPointNumberType, FixedSizeArrayType,
@@ -77,8 +77,8 @@ impl SemanticContext {
         p1_collect_definitions::run(files, &mut binder, diagnostics);
         p2_linearise_contracts::run(files, &mut binder, diagnostics);
         p3_type_definitions::run(files, &mut binder, &mut types, language_version);
-        p4_resolve_references::run(files, &mut binder, &mut types, language_version);
-        let contract_data = p5_compute_linearisations::run(&binder, &types);
+        let contract_data = p4_compute_linearisations::run(&binder, &types);
+        p5_resolve_references::run(files, &mut binder, &mut types, language_version);
 
         let file_node_mapper = FileNodeMapper::build_from(files);
 

crates/solidity-v2/outputs/cargo/semantic/src/passes/mod.rs

@@ -2,8 +2,8 @@ mod common;
 pub(crate) mod p1_collect_definitions;
 pub(crate) mod p2_linearise_contracts;
 pub(crate) mod p3_type_definitions;
-pub(crate) mod p4_resolve_references;
-pub(crate) mod p5_compute_linearisations;
+pub(crate) mod p4_compute_linearisations;
+pub(crate) mod p5_resolve_references;
 
 #[cfg(test)]
 mod tests;

…/passes/p5_compute_linearisations/mod.rs …/passes/p4_compute_linearisations/mod.rscrates/solidity-v2/outputs/cargo/semantic/src/passes/p5_compute_linearisations/mod.rs renamed to crates/solidity-v2/outputs/cargo/semantic/src/passes/p4_compute_linearisations/mod.rs crates/solidity-v2/outputs/cargo/semantic/src/passes/p5_compute_linearisations/mod.rs renamed to crates/solidity-v2/outputs/cargo/semantic/src/passes/p4_compute_linearisations/mod.rs

@@ -37,7 +37,7 @@ fn compute_linearised_members(
     types: &TypeRegistry,
     contract_id: NodeId,
 ) -> ContractLinearisations {
-    let functions = compute_linearised_functions(binder, types, contract_id);
+    let functions = collect_linearised_functions(binder, types, contract_id);
     let state_variables = collect_linearised_state_variables(binder, contract_id);
     let errors = collect_linearised_errors(binder, contract_id);
     let events = collect_linearised_events(binder, contract_id);
@@ -52,7 +52,7 @@ fn compute_linearised_members(
     }
 }
 
-fn compute_linearised_functions(
+fn collect_linearised_functions(
     binder: &Binder,
     types: &TypeRegistry,
     contract_id: NodeId,

…/p4_resolve_references/disambiguation.rs …/p5_resolve_references/disambiguation.rscrates/solidity-v2/outputs/cargo/semantic/src/passes/p4_resolve_references/disambiguation.rs renamed to crates/solidity-v2/outputs/cargo/semantic/src/passes/p5_resolve_references/disambiguation.rs crates/solidity-v2/outputs/cargo/semantic/src/passes/p4_resolve_references/disambiguation.rs renamed to crates/solidity-v2/outputs/cargo/semantic/src/passes/p5_resolve_references/disambiguation.rs

@@ -9,7 +9,7 @@ use slang_solidity_v2_ir::ir::NodeIdGenerator;
 use super::build_file;
 use crate::binder::{Binder, Resolution};
 use crate::passes::{
-    p1_collect_definitions, p2_linearise_contracts, p3_type_definitions, p4_resolve_references,
+    p1_collect_definitions, p2_linearise_contracts, p3_type_definitions, p5_resolve_references,
 };
 use crate::types::TypeRegistry;
 
@@ -278,7 +278,7 @@ contract Test is Base {
         "Semantic diagnostics: {diagnostics:?}"
     );
     p3_type_definitions::run(&files, &mut binder, &mut types, language_version);
-    p4_resolve_references::run(&files, &mut binder, &mut types, language_version);
+    p5_resolve_references::run(&files, &mut binder, &mut types, language_version);
 
     // Verify that references were created and most are resolved
     let references = binder.references();

…/src/passes/p4_resolve_references/mod.rs …/src/passes/p5_resolve_references/mod.rscrates/solidity-v2/outputs/cargo/semantic/src/passes/p4_resolve_references/mod.rs renamed to crates/solidity-v2/outputs/cargo/semantic/src/passes/p5_resolve_references/mod.rs crates/solidity-v2/outputs/cargo/semantic/src/passes/p4_resolve_references/mod.rs renamed to crates/solidity-v2/outputs/cargo/semantic/src/passes/p5_resolve_references/mod.rs

@@ -9,7 +9,7 @@ use crate::binder::Binder;
 use crate::context::SemanticFile;
 use crate::passes::common::node_id_for_expression_typing;
 use crate::passes::{
-    p1_collect_definitions, p2_linearise_contracts, p3_type_definitions, p4_resolve_references,
+    p1_collect_definitions, p2_linearise_contracts, p3_type_definitions, p5_resolve_references,
 };
 use crate::types::{
     ByteArrayType, BytesType, ContractType, DataLocation, FixedSizeArrayType, IntegerType,
@@ -38,7 +38,7 @@ fn analyze(language_version: LanguageVersion, source: &str) -> TypeAnalysis {
         "Semantic diagnostics: {diagnostics:?}"
     );
     p3_type_definitions::run(&files, &mut binder, &mut types, language_version);
-    p4_resolve_references::run(&files, &mut binder, &mut types, language_version);
+    p5_resolve_references::run(&files, &mut binder, &mut types, language_version);
 
     TypeAnalysis {
         file: files.into_iter().next().unwrap(),