From 64dd48a19060ccce8758851ea7bcec1f287f1156 Mon Sep 17 00:00:00 2001
From: Tom French <15848336+TomAFrench@users.noreply.github.com>
Date: Tue, 25 Jun 2024 15:13:31 +0100
Subject: [PATCH] fix: fix usage of `#[abi(tag)]` attribute with elaborator
 (#5298)

# Description

## Problem\*

Resolves <!-- Link to GitHub Issue -->

## Summary\*

Followup to #5292 to handle globals as well

## Additional Context



## Documentation\*

Check one:
- [ ] No documentation needed.
- [ ] Documentation included in this PR.
- [ ] **[For Experimental Features]** Documentation to be submitted in a
separate PR.

# PR Checklist\*

- [ ] I have tested the changes locally.
- [ ] I have formatted the changes with [Prettier](https://prettier.io/)
and/or `cargo fmt` on default settings.
---
 compiler/noirc_frontend/src/elaborator/mod.rs            | 2 +-
 .../compile_success_contract/abi_attribute/Nargo.toml    | 6 ++++++
 .../compile_success_contract/abi_attribute/src/main.nr   | 9 +++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 test_programs/compile_success_contract/abi_attribute/Nargo.toml
 create mode 100644 test_programs/compile_success_contract/abi_attribute/src/main.nr

diff --git a/compiler/noirc_frontend/src/elaborator/mod.rs b/compiler/noirc_frontend/src/elaborator/mod.rs
index 7b3cc59e341..46406083a09 100644
--- a/compiler/noirc_frontend/src/elaborator/mod.rs
+++ b/compiler/noirc_frontend/src/elaborator/mod.rs
@@ -1289,7 +1289,7 @@ impl<'context> Elaborator<'context> {
         self.current_item = Some(DependencyId::Global(global_id));
         let let_stmt = global.stmt_def;
 
-        if !self.in_contract
+        if !self.module_id().module(self.def_maps).is_contract
             && let_stmt.attributes.iter().any(|attr| matches!(attr, SecondaryAttribute::Abi(_)))
         {
             let span = let_stmt.pattern.span();
diff --git a/test_programs/compile_success_contract/abi_attribute/Nargo.toml b/test_programs/compile_success_contract/abi_attribute/Nargo.toml
new file mode 100644
index 00000000000..56fa88ccb68
--- /dev/null
+++ b/test_programs/compile_success_contract/abi_attribute/Nargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "abi_attribute"
+type = "contract"
+authors = [""]
+
+[dependencies]
diff --git a/test_programs/compile_success_contract/abi_attribute/src/main.nr b/test_programs/compile_success_contract/abi_attribute/src/main.nr
new file mode 100644
index 00000000000..d658823d519
--- /dev/null
+++ b/test_programs/compile_success_contract/abi_attribute/src/main.nr
@@ -0,0 +1,9 @@
+contract Foo {
+    #[abi(foo)]
+    global foo: Field = 42;
+    
+    #[abi(bar)]
+    struct Bar {
+        inner: Field
+    }
+}