[move][receiver syntax][1/n] Move module dependency ordering to after typing (#13820)

- With receiver syntax, we will not be able to determine immediate
dependencies until after typing
- As such, module ordering must be done after typing. The logic remains
the same

## Test Plan 

Internal compiler change (updated some location information for tests)

---
If your changes are not user-facing and not a breaking change, you can
skip the following section. Otherwise, please indicate what changed, and
then add to the Release Notes section as highlighted during the release
process.

### Type of Change (Check all that apply)

- [ ] protocol change
- [ ] user-visible impact
- [ ] breaking change for a client SDKs
- [ ] breaking change for FNs (FN binary must upgrade)
- [ ] breaking change for validators or node operators (must upgrade
binaries)
- [ ] breaking change for on-chain data layout
- [ ] necessitate either a data wipe or data migration

### Release notes

Author: tnowacki

move-compiler/src/expansion/ast.rs

@@ -94,8 +94,6 @@ pub struct Script {
     pub package_name: Option<Symbol>,
     pub attributes: Attributes,
     pub loc: Loc,
-    pub immediate_neighbors: UniqueMap<ModuleIdent, Neighbor>,
-    pub used_addresses: BTreeSet<Address>,
     pub constants: UniqueMap<ConstantName, Constant>,
     pub function_name: FunctionName,
     pub function: Function,
@@ -126,11 +124,6 @@ pub struct ModuleDefinition {
     pub attributes: Attributes,
     pub loc: Loc,
     pub is_source_module: bool,
-    /// `dependency_order` is the topological order/rank in the dependency graph.
-    /// `dependency_order` is initialized at `0` and set in the uses pass
-    pub dependency_order: usize,
-    pub immediate_neighbors: UniqueMap<ModuleIdent, Neighbor>,
-    pub used_addresses: BTreeSet<Address>,
     pub friends: UniqueMap<ModuleIdent, Friend>,
     pub structs: UniqueMap<StructName, StructDefinition>,
     pub functions: UniqueMap<FunctionName, Function>,
@@ -148,12 +141,6 @@ pub struct Friend {
     pub loc: Loc,
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
-pub enum Neighbor {
-    Dependency,
-    Friend,
-}
-
 //**************************************************************************************************
 // Structs
 //**************************************************************************************************
@@ -811,15 +798,6 @@ impl fmt::Display for Address {
     }
 }
 
-impl fmt::Display for Neighbor {
-    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
-        match self {
-            Neighbor::Dependency => write!(f, "neighbor#dependency"),
-            Neighbor::Friend => write!(f, "neighbor#friend"),
-        }
-    }
-}
-
 impl fmt::Display for AttributeName_ {
     fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
         match self {
@@ -962,8 +940,6 @@ impl AstDebug for Script {
             package_name,
             attributes,
             loc: _loc,
-            immediate_neighbors,
-            used_addresses,
             constants,
             function_name,
             function,
@@ -975,14 +951,6 @@ impl AstDebug for Script {
             w.writeln(&format!("{}", n))
         }
         attributes.ast_debug(w);
-        for (mident, neighbor) in immediate_neighbors.key_cloned_iter() {
-            w.write(&format!("{} {};", neighbor, mident));
-            w.new_line();
-        }
-        for addr in used_addresses {
-            w.write(&format!("uses address {};", addr));
-            w.new_line()
-        }
         for cdef in constants.key_cloned_iter() {
             cdef.ast_debug(w);
             w.new_line();
@@ -1002,9 +970,6 @@ impl AstDebug for ModuleDefinition {
             attributes,
             loc: _loc,
             is_source_module,
-            dependency_order,
-            immediate_neighbors,
-            used_addresses,
             friends,
             structs,
             functions,
@@ -1022,15 +987,6 @@ impl AstDebug for ModuleDefinition {
         } else {
             "library module"
         });
-        w.writeln(&format!("dependency order #{}", dependency_order));
-        for (mident, neighbor) in immediate_neighbors.key_cloned_iter() {
-            w.write(&format!("{} {};", neighbor, mident));
-            w.new_line();
-        }
-        for addr in used_addresses {
-            w.write(&format!("uses address {};", addr));
-            w.new_line()
-        }
         for (mident, _loc) in friends.key_cloned_iter() {
             w.write(&format!("friend {};", mident));
             w.new_line();

move-compiler/src/expansion/mod.rs

@@ -5,6 +5,5 @@
 mod aliases;
 pub mod ast;
 mod byte_string;
-mod dependency_ordering;
 mod hex_string;
 pub(crate) mod translate;

move-compiler/src/expansion/translate.rs

@@ -195,9 +195,9 @@ pub fn program(
             }
         }
     }
-    let mut module_map = source_module_map;
+    let module_map = source_module_map;
 
-    let mut scripts = {
+    let scripts = {
         let mut collected: BTreeMap<Symbol, Vec<E::Script>> = BTreeMap::new();
         for s in scripts {
             collected
@@ -227,7 +227,6 @@ pub fn program(
         keyed
     };
 
-    super::dependency_ordering::verify(context.env, &mut module_map, &mut scripts);
     E::Program {
         modules: module_map,
         scripts,
@@ -481,9 +480,6 @@ fn module_(
         attributes,
         loc,
         is_source_module: context.is_source_definition,
-        dependency_order: 0,
-        immediate_neighbors: UniqueMap::new(),
-        used_addresses: BTreeSet::new(),
         friends,
         structs,
         constants,
@@ -650,8 +646,6 @@ fn script_(context: &mut Context, package_name: Option<Symbol>, pscript: P::Scri
         package_name,
         attributes,
         loc,
-        immediate_neighbors: UniqueMap::new(),
-        used_addresses: BTreeSet::new(),
         constants,
         function_name,
         function,

move-compiler/src/hlir/translate.rs

@@ -212,15 +212,19 @@ fn module(
     mdef: T::ModuleDefinition,
 ) -> (ModuleIdent, H::ModuleDefinition) {
     let T::ModuleDefinition {
+        loc: _,
         warning_filter,
         package_name,
         attributes,
         is_source_module,
         dependency_order,
+        immediate_neighbors: _,
+        used_addresses: _,
         friends,
         structs: tstructs,
         functions: tfunctions,
         constants: tconstants,
+        spec_dependencies: _,
     } = mdef;
     context.env.add_warning_filter_scope(warning_filter.clone());
     let structs = tstructs.map(|name, s| struct_def(context, name, s));
@@ -263,9 +267,12 @@ fn script(context: &mut Context, tscript: T::Script) -> H::Script {
         package_name,
         attributes,
         loc,
+        immediate_neighbors: _,
+        used_addresses: _,
         constants: tconstants,
         function_name,
         function: tfunction,
+        spec_dependencies: _,
     } = tscript;
     context.env.add_warning_filter_scope(warning_filter.clone());
     let constants = tconstants.map(|name, c| constant(context, name, c));

move-compiler/src/naming/ast.rs

@@ -31,6 +31,13 @@ pub struct Program {
     pub scripts: BTreeMap<Symbol, Script>,
 }
 
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub enum Neighbor_ {
+    Dependency,
+    Friend,
+}
+pub type Neighbor = Spanned<Neighbor_>;
+
 //**************************************************************************************************
 // Scripts
 //**************************************************************************************************
@@ -45,6 +52,8 @@ pub struct Script {
     pub constants: UniqueMap<ConstantName, Constant>,
     pub function_name: FunctionName,
     pub function: Function,
+    // module dependencies referenced in specs
+    pub spec_dependencies: BTreeSet<(ModuleIdent, Neighbor)>,
 }
 
 //**************************************************************************************************
@@ -53,18 +62,18 @@ pub struct Script {
 
 #[derive(Debug, Clone)]
 pub struct ModuleDefinition {
+    pub loc: Loc,
     pub warning_filter: WarningFilters,
     // package name metadata from compiler arguments, not used for any language rules
     pub package_name: Option<Symbol>,
     pub attributes: Attributes,
     pub is_source_module: bool,
-    /// `dependency_order` is the topological order/rank in the dependency graph.
-    /// `dependency_order` is initialized at `0` and set in the uses pass
-    pub dependency_order: usize,
     pub friends: UniqueMap<ModuleIdent, Friend>,
     pub structs: UniqueMap<StructName, StructDefinition>,
     pub constants: UniqueMap<ConstantName, Constant>,
     pub functions: UniqueMap<FunctionName, Function>,
+    // module dependencies referenced in specs
+    pub spec_dependencies: BTreeSet<(ModuleIdent, Neighbor)>,
 }
 
 //**************************************************************************************************
@@ -730,6 +739,15 @@ impl AstDebug for Program {
     }
 }
 
+impl AstDebug for Neighbor_ {
+    fn ast_debug(&self, w: &mut AstWriter) {
+        match self {
+            Neighbor_::Dependency => w.write("neighbor#dependency"),
+            Neighbor_::Friend => w.write("neighbor#friend"),
+        }
+    }
+}
+
 impl AstDebug for Script {
     fn ast_debug(&self, w: &mut AstWriter) {
         let Script {
@@ -740,12 +758,18 @@ impl AstDebug for Script {
             constants,
             function_name,
             function,
+            spec_dependencies,
         } = self;
         warning_filter.ast_debug(w);
         if let Some(n) = package_name {
             w.writeln(&format!("{}", n))
         }
         attributes.ast_debug(w);
+        for (m, neighbor) in spec_dependencies {
+            w.write(&format!("spec_dep {m} is"));
+            neighbor.ast_debug(w);
+            w.writeln(";");
+        }
         for cdef in constants.key_cloned_iter() {
             cdef.ast_debug(w);
             w.new_line();
@@ -757,15 +781,16 @@ impl AstDebug for Script {
 impl AstDebug for ModuleDefinition {
     fn ast_debug(&self, w: &mut AstWriter) {
         let ModuleDefinition {
+            loc: _,
             warning_filter,
             package_name,
             attributes,
             is_source_module,
-            dependency_order,
             friends,
             structs,
             constants,
             functions,
+            spec_dependencies,
         } = self;
         warning_filter.ast_debug(w);
         if let Some(n) = package_name {
@@ -777,7 +802,11 @@ impl AstDebug for ModuleDefinition {
         } else {
             w.writeln("source module")
         }
-        w.writeln(&format!("dependency order #{}", dependency_order));
+        for (m, neighbor) in spec_dependencies {
+            w.write(&format!("spec_dep {m} is"));
+            neighbor.ast_debug(w);
+            w.writeln(";");
+        }
         for (mident, _loc) in friends.key_cloned_iter() {
             w.write(&format!("friend {};", mident));
             w.new_line();