feat: Allow globals to refer to any expression

compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs

@@ -15,7 +15,7 @@
 use crate::hir::Context;
 
 use crate::macros_api::{MacroError, MacroProcessor};
-use crate::node_interner::{FuncId, NodeInterner, StmtId, StructId, TraitId, TypeAliasId};
+use crate::node_interner::{FuncId, GlobalId, NodeInterner, StructId, TraitId, TypeAliasId};
 
 use crate::parser::{ParserError, SortedModule};
 use crate::{
@@ -109,7 +109,7 @@
 pub struct UnresolvedGlobal {
     pub file_id: FileId,
     pub module_id: LocalModuleId,
-    pub stmt_id: StmtId,
+    pub global_id: GlobalId,
     pub stmt_def: LetStatement,
 }
 
@@ -317,7 +317,7 @@
         // Must resolve structs before we resolve globals.
         errors.extend(resolve_structs(context, def_collector.collected_types, crate_id));
 
-        // We must wait to resolve non-integer globals until after we resolve structs since structs
+        // We must wait to resolve non-integer globals until after we resolve structs since struct
         // globals will need to reference the struct type they're initialized to to ensure they are valid.
         resolved_globals.extend(resolve_globals(context, other_globals, crate_id));
         errors.extend(resolved_globals.errors);
@@ -436,15 +436,15 @@
 
 fn type_check_globals(
     interner: &mut NodeInterner,
-    global_ids: Vec<(FileId, StmtId)>,
+    global_ids: Vec<(FileId, GlobalId)>,
 ) -> Vec<(CompilationError, fm::FileId)> {
     global_ids
-        .iter()
-        .flat_map(|(file_id, stmt_id)| {
-            TypeChecker::check_global(stmt_id, interner)
+        .into_iter()
+        .flat_map(|(file_id, global_id)| {
+            TypeChecker::check_global(global_id, interner)
                 .iter()
                 .cloned()
-                .map(|e| (e.into(), *file_id))
+                .map(|e| (e.into(), file_id))
                 .collect::<Vec<_>>()
         })
         .collect()
@@ -455,18 +455,18 @@
     file_func_ids: Vec<(FileId, FuncId)>,
 ) -> Vec<(CompilationError, fm::FileId)> {
     file_func_ids
-        .iter()
+        .into_iter()
         .flat_map(|(file, func)| {
-            type_check_func(interner, *func)
+            type_check_func(interner, func)
                 .iter()
                 .cloned()
-                .map(|e| (e.into(), *file))
+                .map(|e| (e.into(), file))
                 .collect::<Vec<_>>()
         })
         .collect()
 }
 
 // TODO(vitkov): Move this out of here and into type_check
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn check_methods_signatures(
     resolver: &mut Resolver,

compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs

@@ -89,13 +89,12 @@
         for global in globals {
             let name = global.pattern.name_ident().clone();
 
-            // First create dummy function in the DefInterner
-            // So that we can get a StmtId
-            let stmt_id = context.def_interner.push_empty_global();
+            let global_id =
+                context.def_interner.push_empty_global(name.clone(), self.module_id, self.file_id);
 
             // Add the statement to the scope so its path can be looked up later
-            let result =
-                self.def_collector.def_map.modules[self.module_id.0].declare_global(name, stmt_id);
+            let result = self.def_collector.def_map.modules[self.module_id.0]
+                .declare_global(name, global_id);
 
             if let Err((first_def, second_def)) = result {
                 let err = DefCollectorErrorKind::Duplicate {
@@ -109,7 +108,7 @@
             self.def_collector.collected_globals.push(UnresolvedGlobal {
                 file_id: self.file_id,
                 module_id: self.module_id,
-                stmt_id,
+                global_id,
                 stmt_def: global,
             });
         }
@@ -440,11 +439,15 @@
                         }
                     }
                     TraitItem::Constant { name, .. } => {
-                        let stmt_id = context.def_interner.push_empty_global();
+                        let global_id = context.def_interner.push_empty_global(
+                            name.clone(),
+                            trait_id.0.local_id,
+                            self.file_id,
+                        );
 
                         if let Err((first_def, second_def)) = self.def_collector.def_map.modules
                             [trait_id.0.local_id.0]
-                            .declare_global(name.clone(), stmt_id)
+                            .declare_global(name.clone(), global_id)
                         {
                             let error = DefCollectorErrorKind::Duplicate {
                                 typ: DuplicateType::TraitAssociatedConst,
@@ -455,7 +458,7 @@
                         }
                     }
                     TraitItem::Type { name } => {
                         // TODO(nickysn or alexvitkov): implement context.def_interner.push_empty_type_alias and get an id, instead of using TypeAliasId::dummy_id()
                         if let Err((first_def, second_def)) = self.def_collector.def_map.modules
                             [trait_id.0.local_id.0]
                             .declare_type_alias(name.clone(), TypeAliasId::dummy_id())

compiler/noirc_frontend/src/hir/def_map/module_data.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use noirc_errors::Location;
 
 use crate::{
-    node_interner::{FuncId, StmtId, StructId, TraitId, TypeAliasId},
+    node_interner::{FuncId, GlobalId, StructId, TraitId, TypeAliasId},
     Ident,
 };
 
@@ -76,7 +76,7 @@ impl ModuleData {
         self.definitions.remove_definition(name);
     }
 
-    pub fn declare_global(&mut self, name: Ident, id: StmtId) -> Result<(), (Ident, Ident)> {
+    pub fn declare_global(&mut self, name: Ident, id: GlobalId) -> Result<(), (Ident, Ident)> {
         self.declare(name, id.into(), None)
     }
 

compiler/noirc_frontend/src/hir/def_map/module_def.rs

@@ -1,4 +1,4 @@
-use crate::node_interner::{FuncId, StmtId, StructId, TraitId, TypeAliasId};
+use crate::node_interner::{FuncId, GlobalId, StructId, TraitId, TypeAliasId};
 
 use super::ModuleId;
 
@@ -10,7 +10,7 @@ pub enum ModuleDefId {
     TypeId(StructId),
     TypeAliasId(TypeAliasId),
     TraitId(TraitId),
-    GlobalId(StmtId),
+    GlobalId(GlobalId),
 }
 
 impl ModuleDefId {
@@ -42,9 +42,9 @@ impl ModuleDefId {
         }
     }
 
-    pub fn as_global(&self) -> Option<StmtId> {
+    pub fn as_global(&self) -> Option<GlobalId> {
         match self {
-            ModuleDefId::GlobalId(stmt_id) => Some(*stmt_id),
+            ModuleDefId::GlobalId(global_id) => Some(*global_id),
             _ => None,
         }
     }
@@ -88,9 +88,9 @@ impl From<TypeAliasId> for ModuleDefId {
     }
 }
 
-impl From<StmtId> for ModuleDefId {
-    fn from(stmt_id: StmtId) -> Self {
-        ModuleDefId::GlobalId(stmt_id)
+impl From<GlobalId> for ModuleDefId {
+    fn from(global_id: GlobalId) -> Self {
+        ModuleDefId::GlobalId(global_id)
     }
 }
 
@@ -162,13 +162,13 @@ impl TryFromModuleDefId for TraitId {
     }
 }
 
-impl TryFromModuleDefId for StmtId {
+impl TryFromModuleDefId for GlobalId {
     fn try_from(id: ModuleDefId) -> Option<Self> {
         id.as_global()
     }
 
     fn dummy_id() -> Self {
-        StmtId::dummy_id()
+        GlobalId::dummy_id()
     }
 
     fn description() -> String {

compiler/noirc_frontend/src/hir/resolution/globals.rs

@@ -6,13 +6,13 @@ use crate::{
         def_map::ModuleId,
         Context,
     },
-    node_interner::StmtId,
+    node_interner::GlobalId,
 };
 use fm::FileId;
 use iter_extended::vecmap;
 
 pub(crate) struct ResolvedGlobals {
-    pub(crate) globals: Vec<(FileId, StmtId)>,
+    pub(crate) globals: Vec<(FileId, GlobalId)>,
     pub(crate) errors: Vec<(CompilationError, FileId)>,
 }
 
@@ -40,16 +40,13 @@ pub(crate) fn resolve_globals(
             global.file_id,
         );
 
-        let name = global.stmt_def.pattern.name_ident().clone();
-
-        let hir_stmt = resolver.resolve_global_let(global.stmt_def);
+        let hir_stmt = resolver.resolve_global_let(global.stmt_def, global.global_id);
         errors.extend(take_errors(global.file_id, resolver));
 
-        context.def_interner.update_global(global.stmt_id, hir_stmt);
-
-        context.def_interner.push_global(global.stmt_id, name, global.module_id);
+        let statement_id = context.def_interner.get_global(global.global_id).let_statement;
+        context.def_interner.replace_statement(statement_id, hir_stmt);
 
-        (global.file_id, global.stmt_id)
+        (global.file_id, global.global_id)
     });
     ResolvedGlobals { globals, errors }
 }