C#: remove 'System.Enum' from enums in QL

tamasvajk · tamasvajk · commit 44dfafc52ce8 · 2020-12-08T16:40:29.000+01:00
diff --git a/csharp/ql/src/semmle/code/cil/Type.qll b/csharp/ql/src/semmle/code/cil/Type.qll
@@ -79,7 +79,7 @@ class Type extends DotNet::Type, Declaration, TypeContainer, @cil_type {
   }
 
   /** Holds if this type is an `enum`. */
-  predicate isEnum() { this.getBaseClass*().isSystemType("Enum") }
+  predicate isEnum() { this.getBaseClass().isSystemType("Enum") }
 
   /** Holds if this type is public. */
   predicate isPublic() { cil_public(this) }
diff --git a/csharp/ql/test/library-tests/cil/enums/enums.expected b/csharp/ql/test/library-tests/cil/enums/enums.expected
@@ -63,7 +63,6 @@
 | System.Diagnostics.Tracing.EventTask | int |
 | System.Diagnostics.Tracing.ManifestEnvelope.ManifestFormats | byte |
 | System.Diagnostics.Tracing.TraceLoggingDataType | int |
-| System.Enum | int |
 | System.Environment.SpecialFolder | int |
 | System.Environment.SpecialFolderOption | int |
 | System.EnvironmentVariableTarget | int |

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class Type extends DotNet::Type, Declaration, TypeContainer, @cil_type {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	/** Holds if this type is an `enum`. */
`82`		`- predicate isEnum() { this.getBaseClass*().isSystemType("Enum") }`
	`82`	`+ predicate isEnum() { this.getBaseClass().isSystemType("Enum") }`
`83`	`83`
`84`	`84`	`/** Holds if this type is public. */`
`85`	`85`	`predicate isPublic() { cil_public(this) }`