github
diff --git a/‎csharp/extractor/Semmle.Extraction.CIL/Entities/Attribute.cs‎
Lines changed: 15 additions & 4 deletions b/‎csharp/extractor/Semmle.Extraction.CIL/Entities/Attribute.cs‎
Lines changed: 15 additions & 4 deletions
diff --git a/‎csharp/ql/test/library-tests/cil/attributes/Test.cs‎
Lines changed: 7 additions & 0 deletions b/‎csharp/ql/test/library-tests/cil/attributes/Test.cs‎
Lines changed: 7 additions & 0 deletions
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection.Metadata;
 
 namespace Semmle.Extraction.CIL.Entities
@@ -51,19 +52,29 @@ public override IEnumerable<IExtractionProduct> Contents
                 for (var index = 0; index < decoded.FixedArguments.Length; ++index)
                 {
                     var value = decoded.FixedArguments[index].Value;
-                    var stringValue = value?.ToString();
-                    yield return Tuples.cil_attribute_positional_argument(this, index, stringValue ?? "null");
+                    var stringValue = GetStringValue(value);
+                    yield return Tuples.cil_attribute_positional_argument(this, index, stringValue);
                 }
 
                 foreach (var p in decoded.NamedArguments)
                 {
                     var value = p.Value;
-                    var stringValue = value?.ToString();
-                    yield return Tuples.cil_attribute_named_argument(this, p.Name, stringValue ?? "null");
+                    var stringValue = GetStringValue(value);
+                    yield return Tuples.cil_attribute_named_argument(this, p.Name, stringValue);
                 }
             }
         }
 
+        private static string GetStringValue(object? value)
+        {
+            if (value is System.Collections.Immutable.ImmutableArray<CustomAttributeTypedArgument<Type>> values)
+            {
+                return "[" + string.Join(",", values.Select(v => GetStringValue(v.Value))) + "]";
+            }
+
+            return value?.ToString() ?? "null";
+        }
+
         public static IEnumerable<IExtractionProduct> Populate(Context cx, IEntity @object, CustomAttributeHandleCollection attributes)
         {
             foreach (var attrib in attributes)
 
@@ -0,0 +1,7 @@
+// semmle-extractor-options: --cil
+
+using System;
+
+class Test
+{
+}
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.Linq;`
`3`	`4`	`using System.Reflection.Metadata;`
`4`	`5`
`5`	`6`	`namespace Semmle.Extraction.CIL.Entities`
`@@ -51,19 +52,29 @@ public override IEnumerable<IExtractionProduct> Contents`
`51`	`52`	`for (var index = 0; index < decoded.FixedArguments.Length; ++index)`
`52`	`53`	`{`
`53`	`54`	`var value = decoded.FixedArguments[index].Value;`
`54`		`- var stringValue = value?.ToString();`
`55`		`- yield return Tuples.cil_attribute_positional_argument(this, index, stringValue ?? "null");`
	`55`	`+ var stringValue = GetStringValue(value);`
	`56`	`+ yield return Tuples.cil_attribute_positional_argument(this, index, stringValue);`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`foreach (var p in decoded.NamedArguments)`
`59`	`60`	`{`
`60`	`61`	`var value = p.Value;`
`61`		`- var stringValue = value?.ToString();`
`62`		`- yield return Tuples.cil_attribute_named_argument(this, p.Name, stringValue ?? "null");`
	`62`	`+ var stringValue = GetStringValue(value);`
	`63`	`+ yield return Tuples.cil_attribute_named_argument(this, p.Name, stringValue);`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`
	`68`	`+ private static string GetStringValue(object? value)`
	`69`	`+ {`
	`70`	`+ if (value is System.Collections.Immutable.ImmutableArray<CustomAttributeTypedArgument<Type>> values)`
	`71`	`+ {`
	`72`	`+ return "[" + string.Join(",", values.Select(v => GetStringValue(v.Value))) + "]";`
	`73`	`+ }`
	`74`	`+`
	`75`	`+ return value?.ToString() ?? "null";`
	`76`	`+ }`
	`77`	`+`
`67`	`78`	`public static IEnumerable<IExtractionProduct> Populate(Context cx, IEntity @object, CustomAttributeHandleCollection attributes)`
`68`	`79`	`{`
`69`	`80`	`foreach (var attrib in attributes)`