From 70c776ae2148b7b4a66134ba9c9c47846d8345d0 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 9 Mar 2025 11:24:54 +0000
Subject: [PATCH 1/8] RULE-8-7: Restructure test

Move single translation unit items into the translation unit, not
the shared header.
---
 .../RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected | 6 +++---
 c/misra/test/rules/RULE-8-7/test.c                          | 3 +++
 c/misra/test/rules/RULE-8-7/test.h                          | 5 +----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected b/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
index b6a53071d9..fb0b975e88 100644
--- a/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
+++ b/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
@@ -1,3 +1,3 @@
-| test.h:2:12:2:13 | i1 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:4:3:4:4 | i1 | i1 |
-| test.h:3:5:3:6 | i2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:5:3:5:4 | i2 | i2 |
-| test.h:5:13:5:14 | f2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:7:3:7:4 | call to f2 | call to f2 |
+| test.c:2:5:2:6 | i2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:8:3:8:4 | i2 | i2 |
+| test.h:2:12:2:13 | i1 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:7:3:7:4 | i1 | i1 |
+| test.h:4:13:4:14 | f2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:10:3:10:4 | call to f2 | call to f2 |
diff --git a/c/misra/test/rules/RULE-8-7/test.c b/c/misra/test/rules/RULE-8-7/test.c
index b2cc2a0684..5b83445944 100644
--- a/c/misra/test/rules/RULE-8-7/test.c
+++ b/c/misra/test/rules/RULE-8-7/test.c
@@ -1,4 +1,7 @@
 #include "test.h"
+int i2;           // NON_COMPLIANT - accessed one translation unit
+static void f3(); // COMPLIANT - internal linkage
+extern void f3(); // COMPLIANT - internal linkage
 void f() {
   i = 0;
   i1 = 0;
diff --git a/c/misra/test/rules/RULE-8-7/test.h b/c/misra/test/rules/RULE-8-7/test.h
index 692bb8e3db..218ec18c23 100644
--- a/c/misra/test/rules/RULE-8-7/test.h
+++ b/c/misra/test/rules/RULE-8-7/test.h
@@ -1,7 +1,4 @@
 extern int i;     // COMPLIANT - accessed multiple translation units
 extern int i1;    // NON_COMPLIANT - accessed one translation unit
-int i2;           // NON_COMPLIANT - accessed one translation unit
 extern void f1(); // COMPLIANT  - accessed multiple translation units
-extern void f2(); // NON_COMPLIANT - accessed one translation unit
-static void f3(); // COMPLIANT - internal linkage
-extern void f3(); // COMPLIANT - internal linkage
\ No newline at end of file
+extern void f2(); // NON_COMPLIANT - accessed one translation unit
\ No newline at end of file

From 32fd091717729020734010580bf4b5775851b765 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 9 Mar 2025 11:28:46 +0000
Subject: [PATCH 2/8] RULE-8-7: Add appropriate definitions to test

Ensure definitions occur in one translation unit only.
---
 .../ShouldNotBeDefinedWithExternalLinkage.expected       | 6 +++---
 c/misra/test/rules/RULE-8-7/test.c                       | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected b/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
index fb0b975e88..5f04b41ac0 100644
--- a/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
+++ b/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
@@ -1,3 +1,3 @@
-| test.c:2:5:2:6 | i2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:8:3:8:4 | i2 | i2 |
-| test.h:2:12:2:13 | i1 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:7:3:7:4 | i1 | i1 |
-| test.h:4:13:4:14 | f2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:10:3:10:4 | call to f2 | call to f2 |
+| test.c:3:5:3:6 | i1 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:10:3:10:4 | i1 | i1 |
+| test.c:4:5:4:6 | i2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:11:3:11:4 | i2 | i2 |
+| test.c:6:6:6:7 | f2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:13:3:13:4 | call to f2 | call to f2 |
diff --git a/c/misra/test/rules/RULE-8-7/test.c b/c/misra/test/rules/RULE-8-7/test.c
index 5b83445944..dc59be7394 100644
--- a/c/misra/test/rules/RULE-8-7/test.c
+++ b/c/misra/test/rules/RULE-8-7/test.c
@@ -1,7 +1,10 @@
 #include "test.h"
-int i2;           // NON_COMPLIANT - accessed one translation unit
-static void f3(); // COMPLIANT - internal linkage
-extern void f3(); // COMPLIANT - internal linkage
+int i = 0;
+int i1 = 0;
+int i2;              // NON_COMPLIANT - accessed one translation unit
+void f1() {}         // Definition
+void f2() {}         // Definition
+static void f3() {}; // COMPLIANT - internal linkage
 void f() {
   i = 0;
   i1 = 0;

From 39f7c94a661c90c6903e092885e3c0d2b095330e Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 9 Mar 2025 11:34:36 +0000
Subject: [PATCH 3/8] RULE-8-7: Require the reference to exist in the same TU

The translation unit of the definition needs to be the same as the
translation unit of the reference, otherwise it is not eligible
for internal linkage.
---
 .../rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql | 4 +++-
 .../RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected | 6 +++---
 c/misra/test/rules/RULE-8-7/test.c                          | 1 +
 c/misra/test/rules/RULE-8-7/test.h                          | 3 ++-
 c/misra/test/rules/RULE-8-7/test1.c                         | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql b/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
index faa915fdd5..7b882821b8 100644
--- a/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
+++ b/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
@@ -51,6 +51,8 @@ where
   not exists(TranslationUnit t2 |
     isReferencedInTranslationUnit(e, _, t2) and
     not t1 = t2
-  )
+  ) and
+  // Definition is also in the same translation unit
+  e.getDefinition().getFile() = t1.getAUserFile()
 select e, "Declaration with external linkage is accessed in only one translation unit $@.", a1,
   a1.toString()
diff --git a/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected b/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
index 5f04b41ac0..d2a6b0e53f 100644
--- a/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
+++ b/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
@@ -1,3 +1,3 @@
-| test.c:3:5:3:6 | i1 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:10:3:10:4 | i1 | i1 |
-| test.c:4:5:4:6 | i2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:11:3:11:4 | i2 | i2 |
-| test.c:6:6:6:7 | f2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:13:3:13:4 | call to f2 | call to f2 |
+| test.c:3:5:3:6 | i1 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:11:3:11:4 | i1 | i1 |
+| test.c:4:5:4:6 | i2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:12:3:12:4 | i2 | i2 |
+| test.c:6:6:6:7 | f2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:14:3:14:4 | call to f2 | call to f2 |
diff --git a/c/misra/test/rules/RULE-8-7/test.c b/c/misra/test/rules/RULE-8-7/test.c
index dc59be7394..591f15a2c4 100644
--- a/c/misra/test/rules/RULE-8-7/test.c
+++ b/c/misra/test/rules/RULE-8-7/test.c
@@ -5,6 +5,7 @@ int i2;              // NON_COMPLIANT - accessed one translation unit
 void f1() {}         // Definition
 void f2() {}         // Definition
 static void f3() {}; // COMPLIANT - internal linkage
+void f4() {}         // Definition
 void f() {
   i = 0;
   i1 = 0;
diff --git a/c/misra/test/rules/RULE-8-7/test.h b/c/misra/test/rules/RULE-8-7/test.h
index 218ec18c23..2b997928bd 100644
--- a/c/misra/test/rules/RULE-8-7/test.h
+++ b/c/misra/test/rules/RULE-8-7/test.h
@@ -1,4 +1,5 @@
 extern int i;     // COMPLIANT - accessed multiple translation units
 extern int i1;    // NON_COMPLIANT - accessed one translation unit
 extern void f1(); // COMPLIANT  - accessed multiple translation units
-extern void f2(); // NON_COMPLIANT - accessed one translation unit
\ No newline at end of file
+extern void f2(); // NON_COMPLIANT - accessed one translation unit
+extern void f4(); // COMPLIANT - accessed across translation units
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-7/test1.c b/c/misra/test/rules/RULE-8-7/test1.c
index 77377e78df..c0ed69c7d0 100644
--- a/c/misra/test/rules/RULE-8-7/test1.c
+++ b/c/misra/test/rules/RULE-8-7/test1.c
@@ -2,4 +2,5 @@
 void f() {
   i = 0;
   f1();
+  f4();
 }
\ No newline at end of file

From d6710e0c64acb7ac72dc2bef72d48d17a0711e65 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 9 Mar 2025 11:37:42 +0000
Subject: [PATCH 4/8] RULE-8-7: Only report external identifiers with
 definitions

---
 .../rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql    | 2 ++
 c/misra/test/rules/RULE-8-7/test.h                             | 3 ++-
 c/misra/test/rules/RULE-8-7/test1.c                            | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql b/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
index 7b882821b8..db8623d9f2 100644
--- a/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
+++ b/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
@@ -46,6 +46,8 @@ predicate isReferencedInTranslationUnit(
 from ExternalIdentifiers e, ExternalIdentifierReference a1, TranslationUnit t1
 where
   not isExcluded(e, Declarations6Package::shouldNotBeDefinedWithExternalLinkageQuery()) and
+  // Only report external identifiers where we see the definition
+  e.hasDefinition() and
   isReferencedInTranslationUnit(e, a1, t1) and
   // Not referenced in any other translation unit
   not exists(TranslationUnit t2 |
diff --git a/c/misra/test/rules/RULE-8-7/test.h b/c/misra/test/rules/RULE-8-7/test.h
index 2b997928bd..782099de02 100644
--- a/c/misra/test/rules/RULE-8-7/test.h
+++ b/c/misra/test/rules/RULE-8-7/test.h
@@ -2,4 +2,5 @@ extern int i;     // COMPLIANT - accessed multiple translation units
 extern int i1;    // NON_COMPLIANT - accessed one translation unit
 extern void f1(); // COMPLIANT  - accessed multiple translation units
 extern void f2(); // NON_COMPLIANT - accessed one translation unit
-extern void f4(); // COMPLIANT - accessed across translation units
\ No newline at end of file
+extern void f4(); // COMPLIANT - accessed across translation units
+extern void f5(); // COMPLIANT - no definition
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-7/test1.c b/c/misra/test/rules/RULE-8-7/test1.c
index c0ed69c7d0..6d1eab16d0 100644
--- a/c/misra/test/rules/RULE-8-7/test1.c
+++ b/c/misra/test/rules/RULE-8-7/test1.c
@@ -3,4 +3,5 @@ void f() {
   i = 0;
   f1();
   f4();
+  f5();
 }
\ No newline at end of file

From 569fa76250457eb2a6e05081c4365e15c96181b4 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 9 Mar 2025 18:39:50 +0000
Subject: [PATCH 5/8] RULE-8-7: Support use in headers.

---
 .../rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql    | 3 ++-
 .../RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected    | 1 +
 c/misra/test/rules/RULE-8-7/test1.c                            | 2 +-
 c/misra/test/rules/RULE-8-7/test2.h                            | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 c/misra/test/rules/RULE-8-7/test2.h

diff --git a/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql b/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
index db8623d9f2..9cdd6532a9 100644
--- a/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
+++ b/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
@@ -40,7 +40,8 @@ predicate isReferencedInTranslationUnit(
   ExternalIdentifiers e, ExternalIdentifierReference r, TranslationUnit t
 ) {
   r.getExternalIdentifierTarget() = e and
-  r.getFile() = t
+  // Used within the translation unit or an included header
+  r.getFile() = t.getAUserFile()
 }
 
 from ExternalIdentifiers e, ExternalIdentifierReference a1, TranslationUnit t1
diff --git a/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected b/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
index d2a6b0e53f..6610bf236e 100644
--- a/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
+++ b/c/misra/test/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.expected
@@ -1,3 +1,4 @@
+| test2.h:2:13:2:14 | f6 | Declaration with external linkage is accessed in only one translation unit $@. | test2.h:3:22:3:23 | call to f6 | call to f6 |
 | test.c:3:5:3:6 | i1 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:11:3:11:4 | i1 | i1 |
 | test.c:4:5:4:6 | i2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:12:3:12:4 | i2 | i2 |
 | test.c:6:6:6:7 | f2 | Declaration with external linkage is accessed in only one translation unit $@. | test.c:14:3:14:4 | call to f2 | call to f2 |
diff --git a/c/misra/test/rules/RULE-8-7/test1.c b/c/misra/test/rules/RULE-8-7/test1.c
index 6d1eab16d0..5c3b3759c9 100644
--- a/c/misra/test/rules/RULE-8-7/test1.c
+++ b/c/misra/test/rules/RULE-8-7/test1.c
@@ -1,4 +1,4 @@
-#include "test.h"
+#include "test2.h"
 void f() {
   i = 0;
   f1();
diff --git a/c/misra/test/rules/RULE-8-7/test2.h b/c/misra/test/rules/RULE-8-7/test2.h
new file mode 100644
index 0000000000..d203c3259a
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-7/test2.h
@@ -0,0 +1,3 @@
+#include "test.h"
+extern void f6() {} // NON_COMPLIANT
+static void test() { f6(); }
\ No newline at end of file

From 8e3109342d122a58ce32805fbca423df451dc0ce Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 9 Mar 2025 18:42:43 +0000
Subject: [PATCH 6/8] Add change note.

---
 change_notes/2025-03-09-rule-8-7.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 change_notes/2025-03-09-rule-8-7.md

diff --git a/change_notes/2025-03-09-rule-8-7.md b/change_notes/2025-03-09-rule-8-7.md
new file mode 100644
index 0000000000..5308c97ce3
--- /dev/null
+++ b/change_notes/2025-03-09-rule-8-7.md
@@ -0,0 +1,4 @@
+ - `RULE-8-7` - `ShouldNotBeDefinedWithExternalLinkage.ql`:
+   - Remove false positives where the declation is not defined in the database.
+   - Remove false positives where the definition and reference are in different translation units.
+   - Remove false positives where the reference occurs in a header file.
\ No newline at end of file

From c73badfcc7697b291b05ffa1da41c6afe902d826 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Wed, 12 Mar 2025 00:36:26 +0000
Subject: [PATCH 7/8] Update change_notes/2025-03-09-rule-8-7.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 change_notes/2025-03-09-rule-8-7.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/change_notes/2025-03-09-rule-8-7.md b/change_notes/2025-03-09-rule-8-7.md
index 5308c97ce3..3c3678ca6d 100644
--- a/change_notes/2025-03-09-rule-8-7.md
+++ b/change_notes/2025-03-09-rule-8-7.md
@@ -1,4 +1,4 @@
  - `RULE-8-7` - `ShouldNotBeDefinedWithExternalLinkage.ql`:
-   - Remove false positives where the declation is not defined in the database.
+   - Remove false positives where the declaration is not defined in the database.
    - Remove false positives where the definition and reference are in different translation units.
    - Remove false positives where the reference occurs in a header file.
\ No newline at end of file

From ce45538a5a72d80440a2c36d2210790309c54995 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 11 Mar 2025 17:42:41 -0700
Subject: [PATCH 8/8] Reformat C test case

---
 c/misra/test/rules/RULE-8-7/test.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/c/misra/test/rules/RULE-8-7/test.c b/c/misra/test/rules/RULE-8-7/test.c
index 591f15a2c4..3789a1d269 100644
--- a/c/misra/test/rules/RULE-8-7/test.c
+++ b/c/misra/test/rules/RULE-8-7/test.c
@@ -1,11 +1,11 @@
 #include "test.h"
 int i = 0;
 int i1 = 0;
-int i2;              // NON_COMPLIANT - accessed one translation unit
-void f1() {}         // Definition
-void f2() {}         // Definition
-static void f3() {}; // COMPLIANT - internal linkage
-void f4() {}         // Definition
+int i2;             // NON_COMPLIANT - accessed one translation unit
+void f1() {}        // Definition
+void f2() {}        // Definition
+static void f3(){}; // COMPLIANT - internal linkage
+void f4() {}        // Definition
 void f() {
   i = 0;
   i1 = 0;