fix: query ModuleImportInfo::aliases with module id alias

0xPolygonMiden · May 24, 2024 · 2036f9a · 2036f9a
1 parent a758180
commit 2036f9a
Show file tree

Hide file tree

Showing 4 changed files with 230 additions and 202 deletions.
diff --git a/frontend-wasm/src/miden_abi/stdlib/crypto/hashes.rs b/frontend-wasm/src/miden_abi/stdlib/crypto/hashes.rs
@@ -28,6 +28,6 @@ pub(crate) fn signatures() -> ModuleFunctionTypeMap {
             [Felt, Felt, Felt, Felt, Felt, Felt, Felt, Felt],
         ),
     );
-    m.insert("miden:prelude/std_crypto_hashes", crypto);
+    m.insert("std::crypto_hashes", crypto);
     m
 }
diff --git a/hir/src/asm/import.rs b/hir/src/asm/import.rs
@@ -35,10 +35,7 @@ impl ModuleImportInfo {
         let module_id = id.module;
         match self.modules.entry(module_id) {
             Entry::Vacant(entry) => {
-                let alias = match module_id.as_str().rsplit_once("::") {
-                    None => module_id.as_symbol(),
-                    Some((_, alias)) => Symbol::intern(alias),
-                };
+                let alias = module_id_alias(module_id);
                 let span = module_id.span();
                 let alias_id = if self.aliases.contains_key(&alias) {
                     // The alias is already used by another module, we must
@@ -69,7 +66,8 @@ impl ModuleImportInfo {
                 self.functions.entry(alias_id).or_default().insert(id);
             }
             Entry::Occupied(_) => {
-                let alias = self.aliases[&module_id];
+                let module_id_alias = module_id_alias(module_id);
+                let alias = self.aliases[&module_id_alias];
                 let functions = self.functions.entry(alias).or_default();
                 functions.insert(id);
             }
@@ -137,6 +135,13 @@ impl ModuleImportInfo {
     }
 }
 
+fn module_id_alias(module_id: Ident) -> Symbol {
+    match module_id.as_str().rsplit_once("::") {
+        None => module_id.as_symbol(),
+        Some((_, alias)) => Symbol::intern(alias),
+    }
+}
+
 /// This represents an import statement in Miden Assembly
 #[derive(Debug, Copy, Clone, Spanned)]
 pub struct MasmImport {