C#: Extract CIL fields using their underlying types for a reference type field and annotate the field as a reference type.

michaelnebel · michaelnebel · commit db047c2c4a0f · 2023-01-30T14:28:35.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Field.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Field.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using Microsoft.CodeAnalysis;
-using System.IO;
+﻿using System.Collections.Generic;
 
 namespace Semmle.Extraction.CIL.Entities
 {
@@ -38,6 +35,11 @@ public override IEnumerable<IExtractionProduct> Contents
                     t = mt.Unmodified;
                     yield return Tuples.cil_custom_modifiers(this, mt.Modifier, mt.IsRequired);
                 }
+                if (t is ByRefType brt)
+                {
+                    t = brt.ElementType;
+                    yield return Tuples.cil_type_annotation(this, TypeAnnotation.Ref);
+                }
                 yield return Tuples.cil_field(this, DeclaringType, Name, t);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using Microsoft.CodeAnalysis;`
`4`		`-using System.IO;`
	`1`	`+using System.Collections.Generic;`
`5`	`2`
`6`	`3`	`namespace Semmle.Extraction.CIL.Entities`
`7`	`4`	`{`
`@@ -38,6 +35,11 @@ public override IEnumerable<IExtractionProduct> Contents`
`38`	`35`	`t = mt.Unmodified;`
`39`	`36`	`yield return Tuples.cil_custom_modifiers(this, mt.Modifier, mt.IsRequired);`
`40`	`37`	`}`
	`38`	`+ if (t is ByRefType brt)`
	`39`	`+ {`
	`40`	`+ t = brt.ElementType;`
	`41`	`+ yield return Tuples.cil_type_annotation(this, TypeAnnotation.Ref);`
	`42`	`+ }`
`41`	`43`	`yield return Tuples.cil_field(this, DeclaringType, Name, t);`
`42`	`44`	`}`
`43`	`45`	`}`