C#: Make array and pointer type mentions symmetrical

tamasvajk · tamasvajk · commit 238ed2e6439d · 2020-10-20T08:23:56.000+02:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs
@@ -29,8 +29,6 @@ private static TypeSyntax GetElementType(TypeSyntax type)
             {
                 case ArrayTypeSyntax ats:
                     return GetElementType(ats.ElementType);
-                case NullableTypeSyntax nts:
-                    return GetElementType(nts.ElementType);
                 case PointerTypeSyntax pts:
                     return GetElementType(pts.ElementType);
                 default:
@@ -44,8 +42,7 @@ private static Type GetElementType(Type type)
             {
                 case ArrayType at:
                     return GetElementType(at.ElementType.Type);
-                case NamedType nt when nt.symbol.IsBoundNullable() ||
-                                       nt.symbol.IsBoundSpan() ||
+                case NamedType nt when nt.symbol.IsBoundSpan() ||
                                        nt.symbol.IsBoundReadOnlySpan():
                     return nt.TypeArguments.Single();
                 case PointerType pt:
@@ -60,6 +57,7 @@ protected override void Populate(TextWriter trapFile)
             switch (syntax.Kind())
             {
                 case SyntaxKind.ArrayType:
+                case SyntaxKind.PointerType:
                     Emit(trapFile, loc ?? syntax.GetLocation(), parent, type);
                     Create(cx, GetElementType(syntax), this, GetElementType(type));
                     return;
@@ -81,12 +79,6 @@ protected override void Populate(TextWriter trapFile)
                     Emit(trapFile, loc ?? syntax.GetLocation(), parent, type);
                     tts.Elements.Zip(tt.TupleElements, (s, t) => Create(cx, s.Type, this, t.Type)).Enumerate();
                     return;
-                case SyntaxKind.PointerType:
-                    var pts = (PointerTypeSyntax)syntax;
-                    var pt = (PointerType)type;
-                    Emit(trapFile, loc ?? syntax.GetLocation(), parent, type);
-                    Create(cx, pts.ElementType, this, pt.PointedAtType);
-                    return;
                 case SyntaxKind.GenericName:
                     var gns = (GenericNameSyntax)syntax;
                     Emit(trapFile, loc ?? gns.Identifier.GetLocation(), parent, type);
diff --git a/csharp/ql/test/library-tests/types/PrintAst.expected b/csharp/ql/test/library-tests/types/PrintAst.expected
@@ -54,20 +54,21 @@ types.cs:
 #   26|         1: [TypeMention] Byte
 #   27|     27: [Method] PointerPointerType
 #   27|       -1: [TypeMention] Byte**
-#   27|         1: [TypeMention] Byte*
-#   27|           1: [TypeMention] Byte
+#   27|         1: [TypeMention] Byte
 #   28|     28: [Method] PointerArrayArrayType
 #   28|       -1: [TypeMention] Byte*[][]
 #   28|         1: [TypeMention] Byte
 #   29|     29: [Method] NullableArrayType
 #   29|       -1: [TypeMention] Nullable
-#   29|         1: [TypeMention] Byte
+#   29|         1: [TypeMention] Nullable<Byte>
+#   29|           1: [TypeMention] Byte
 #   30|     30: [Method] NullableArrayArrayType
 #   30|       -1: [TypeMention] Nullable[]
-#   30|         1: [TypeMention] Byte
+#   30|         1: [TypeMention] Nullable<Byte>
+#   30|           1: [TypeMention] Byte
 #   31|     31: [Method] NullableArrayArrayType2
 #   31|       -1: [TypeMention] Nullable[]
-#   31|         1: [TypeMention] Byte
+#   31|         1: [TypeMention] Nullable<Byte>
 #   32|     32: [Method] Map
 #   32|       -1: [TypeMention] Map<String,Class>
 #   32|         1: [TypeMention] String
