CPP: Fix false positive.

geoffw0 · geoffw0 · commit d85f4b540ca8 · 2018-12-05T10:01:54.000Z
diff --git a/cpp/ql/src/Best Practices/Unused Entities/UnusedStaticVariables.ql b/cpp/ql/src/Best Practices/Unused Entities/UnusedStaticVariables.ql
@@ -25,4 +25,5 @@ where v.isStatic()
   and not v instanceof MemberVariable
   and not declarationHasSideEffects(v)
   and not v.getAnAttribute().hasName("used")
+  and not v.getAnAttribute().hasName("unused")
 select v, "Static variable " + v.getName() + " is never read"
diff --git a/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedStaticVariables/UnusedStaticVariables.expected b/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedStaticVariables/UnusedStaticVariables.expected
@@ -1,3 +1,2 @@
 | test.cpp:7:12:7:21 | staticVar5 | Static variable staticVar5 is never read |
 | test.cpp:8:12:8:21 | staticVar6 | Static variable staticVar6 is never read |
-| test.cpp:9:40:9:49 | staticVar7 | Static variable staticVar7 is never read |
diff --git a/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedStaticVariables/test.cpp b/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedStaticVariables/test.cpp
@@ -6,7 +6,7 @@ static int staticVar3 = 3; // GOOD (used)
 static int staticVar4 = staticVar3; // GOOD (used)
 static int staticVar5; // BAD (unused)
 static int staticVar6 = 6; // BAD (unused)
-static __attribute__((__unused__)) int staticVar7; // GOOD (unused but this is expected) [FALSE POSITIVE]
+static __attribute__((__unused__)) int staticVar7; // GOOD (unused but this is expected)
 
 void f()
 {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`\| test.cpp:7:12:7:21 \| staticVar5 \| Static variable staticVar5 is never read \|`
`2`	`2`	`\| test.cpp:8:12:8:21 \| staticVar6 \| Static variable staticVar6 is never read \|`
`3`		`-\| test.cpp:9:40:9:49 \| staticVar7 \| Static variable staticVar7 is never read \|`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ static int staticVar3 = 3; // GOOD (used)`
`6`	`6`	`static int staticVar4 = staticVar3; // GOOD (used)`
`7`	`7`	`static int staticVar5; // BAD (unused)`
`8`	`8`	`static int staticVar6 = 6; // BAD (unused)`
`9`		`-static __attribute__((__unused__)) int staticVar7; // GOOD (unused but this is expected) [FALSE POSITIVE]`
	`9`	`+static __attribute__((__unused__)) int staticVar7; // GOOD (unused but this is expected)`
`10`	`10`
`11`	`11`	`void f()`
`12`	`12`	`{`