C++: Correctly identify orphaned variables as static

jketema · jketema · commit 5ae8fe502a61 · 2024-06-06T20:35:26.000+02:00
diff --git a/cpp/ql/lib/semmle/code/cpp/Variable.qll b/cpp/ql/lib/semmle/code/cpp/Variable.qll
@@ -410,6 +410,10 @@ class LocalVariable extends LocalScopeVariable, @localvariable {
     or
     orphaned_variables(underlyingElement(this), unresolveElement(result))
   }
+
+  override predicate isStatic() {
+    super.isStatic() or orphaned_variables(underlyingElement(this), _)
+  }
 }
 
 /**
diff --git a/cpp/ql/test/library-tests/variables/variables/variable.expected b/cpp/ql/test/library-tests/variables/variables/variable.expected
@@ -39,4 +39,4 @@
 | variables.cpp:51:9:51:12 | town | file://:0:0:0:0 | char * | Field |  |  |
 | variables.cpp:52:16:52:22 | country | file://:0:0:0:0 | char * | MemberVariable, StaticStorageDurationVariable |  | static |
 | variables.cpp:56:14:56:29 | externInFunction | file://:0:0:0:0 | int | GlobalLikeVariable, GlobalVariable, StaticStorageDurationVariable |  |  |
-| variables.cpp:60:10:60:17 | __func__ | file://:0:0:0:0 | const char[9] | LocalVariable, SemanticStackVariable |  |  |
+| variables.cpp:60:10:60:17 | __func__ | file://:0:0:0:0 | const char[9] | GlobalLikeVariable, StaticInitializedStaticLocalVariable |  | static |

Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,10 @@ class LocalVariable extends LocalScopeVariable, @localvariable {`
`410`	`410`	`or`
`411`	`411`	`orphaned_variables(underlyingElement(this), unresolveElement(result))`
`412`	`412`	`}`
	`413`	`+`
	`414`	`+ override predicate isStatic() {`
	`415`	`+ super.isStatic() or orphaned_variables(underlyingElement(this), _)`
	`416`	`+ }`
`413`	`417`	`}`
`414`	`418`
`415`	`419`	`/**`