Merge pull request #17340 from hvitved/csharp/ssa-exclude-enums

github · Aug 30, 2024 · 642ec38 · 642ec38
2 parents 89c387c + 4ef4ede
commit 642ec38
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
@@ -108,7 +108,11 @@ private module SourceVariableImpl {
    */
   predicate isPlainFieldOrPropAccess(FieldOrPropAccess fpa, FieldOrProp fp, Callable c) {
     fieldOrPropAccessInCallable(fpa, fp, c) and
-    (ownFieldOrPropAccess(fpa) or fp.isStatic())
+    (
+      ownFieldOrPropAccess(fpa)
+      or
+      fp.isStatic() and not fp instanceof EnumConstant
+    )
   }
 
   /**

diff --git a/csharp/ql/test/library-tests/dataflow/ssa/Enum.cs b/csharp/ql/test/library-tests/dataflow/ssa/Enum.cs
@@ -0,0 +1,14 @@
+enum E
+{
+    A
+}
+
+class EnumTest
+{
+    void M()
+    {
+        // enums are modelled as fields; this test checks that we do not compute SSA for them
+        var e1 = E.A;
+        var e2 = E.A;
+    }
+}