Apply suggestions from code review

tamasvajk · hvitved · tamasvajk · commit 6dd0234b68ab · 2020-12-08T16:40:29.000+01:00
Co-authored-by: Tom Hvitved &lt;hvitved@github.com&gt;
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/TypeDefinitionType.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/TypeDefinitionType.cs
@@ -271,7 +271,7 @@ private bool IsSystemEnum(StringHandle typeName, StringHandle namespaceName)
             foreach (var handle in td.GetFields())
             {
                 var field = Cx.MdReader.GetFieldDefinition(handle);
-                if ((field.Attributes & FieldAttributes.Static) != 0)
+                if (field.Attributes.HasFlag(FieldAttributes.Static))
                 {
                     continue;
                 }
diff --git a/csharp/ql/src/semmle/code/cil/Types.qll b/csharp/ql/src/semmle/code/cil/Types.qll
@@ -50,8 +50,8 @@ class Enum extends ValueOrRefType {
   override IntegralType getUnderlyingType() {
     cil_enum_underlying_type(this, result)
     or
-    not exists(IntegralType underlying | cil_enum_underlying_type(this, underlying)) and
-    result = any(IntType i)
+    not cil_enum_underlying_type(this, _) and
+    result instanceof IntType
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ private bool IsSystemEnum(StringHandle typeName, StringHandle namespaceName)`
`271`	`271`	`foreach (var handle in td.GetFields())`
`272`	`272`	`{`
`273`	`273`	`var field = Cx.MdReader.GetFieldDefinition(handle);`
`274`		`- if ((field.Attributes & FieldAttributes.Static) != 0)`
	`274`	`+ if (field.Attributes.HasFlag(FieldAttributes.Static))`
`275`	`275`	`{`
`276`	`276`	`continue;`
`277`	`277`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ class Enum extends ValueOrRefType {`
`50`	`50`	`override IntegralType getUnderlyingType() {`
`51`	`51`	`cil_enum_underlying_type(this, result)`
`52`	`52`	`or`
`53`		`- not exists(IntegralType underlying \| cil_enum_underlying_type(this, underlying)) and`
`54`		`- result = any(IntType i)`
	`53`	`+ not cil_enum_underlying_type(this, _) and`
	`54`	`+ result instanceof IntType`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`