CPP: Workaround FPs.

geoffw0 · geoffw0 · commit d39d9bf1f0f6 · 2019-07-22T11:48:25.000+01:00
diff --git a/cpp/ql/src/Likely Bugs/UseInOwnInitializer.ql b/cpp/ql/src/Likely Bugs/UseInOwnInitializer.ql
@@ -32,6 +32,7 @@ where va.initializesItself(v, init)
     exists (CrementOperation crement | crement.getAnOperand() = va)
   )
   and not va.isUnevaluated()
+  and not v.isConst()
   and not (
     va.getParent() = init and
     exists(MacroInvocation mi |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/UseInOwnInitializer/UseInOwnInitializer.expected b/cpp/ql/test/query-tests/Likely Bugs/UseInOwnInitializer/UseInOwnInitializer.expected
@@ -2,7 +2,3 @@
 | test.cpp:8:10:8:10 | x | x is used in its own initializer. |
 | test.cpp:57:10:57:10 | x | x is used in its own initializer. |
 | test.cpp:61:24:61:24 | x | x is used in its own initializer. |
-| test.cpp:80:17:80:23 | v2 | v2 is used in its own initializer. |
-| test.cpp:84:16:84:22 | v4 | v4 is used in its own initializer. |
-| test.cpp:89:17:89:23 | v6 | v6 is used in its own initializer. |
-| test.cpp:90:17:90:23 | v7 | v7 is used in its own initializer. |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/UseInOwnInitializer/test.cpp b/cpp/ql/test/query-tests/Likely Bugs/UseInOwnInitializer/test.cpp
@@ -77,15 +77,15 @@ namespace ns1
 namespace ns2
 {
 	const int v1 = ns1::v2; // GOOD
-	const int v2 = ns1::v2; // GOOD [FALSE POSITIVE; produces INVALID_KEY trap warning]
+	const int v2 = ns1::v2; // GOOD [produces INVALID_KEY trap warning]
 };
 
 const int v3 = ns1::v4; // GOOD
-const int v4 = ns1::v4; // GOOD [FALSE POSITIVE]
+const int v4 = ns1::v4; // GOOD
 
 namespace ns3
 {
 	const int v5 = ns1::v6 + 1; // GOOD
-	const int v6 = ns1::v6 + 1; // GOOD  [FALSE POSITIVE; produces INVALID_KEY trap warning]
-	const int v7 = ns3::v7; // BAD
+	const int v6 = ns1::v6 + 1; // GOOD  [produces INVALID_KEY trap warning]
+	const int v7 = ns3::v7; // BAD [NOT DETECTED]
 };

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ where va.initializesItself(v, init)`
`32`	`32`	`exists (CrementOperation crement \| crement.getAnOperand() = va)`
`33`	`33`	`)`
`34`	`34`	`and not va.isUnevaluated()`
	`35`	`+ and not v.isConst()`
`35`	`36`	`and not (`
`36`	`37`	`va.getParent() = init and`
`37`	`38`	`exists(MacroInvocation mi \|`