Merge pull request #2245 from calumgrant/cs/nullability-refactor

C#: Store nullability on the side

Author: hvitved

csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs

@@ -920,7 +920,8 @@ public override void WriteId(TextWriter trapFile, bool inContext)
         {
             elementType.GetId(trapFile, inContext);
             trapFile.Write('[');
-            trapFile.Write(rank);
+            for (int i = 1; i < rank; ++i)
+                trapFile.Write(',');
             trapFile.Write(']');
         }
 
@@ -1206,7 +1207,10 @@ struct Array : ITypeSignature
             public void WriteId(TextWriter trapFile, GenericContext gc)
             {
                 elementType.WriteId(trapFile, gc);
-                trapFile.Write("[]");
+                trapFile.Write('[');
+                for (int i=1; i<shape.Rank; ++i)
+                    trapFile.Write(',');
+                trapFile.Write(']');
             }
         }
 

csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs

@@ -21,7 +21,7 @@ public override void WriteId(TextWriter trapFile)
 
         public override void Populate(TextWriter trapFile)
         {
-            PopulateNullability(trapFile, symbol.NullableAnnotation);
+            PopulateNullability(trapFile, symbol.GetAnnotatedType());
 
             var type = Type.Create(Context, symbol.Type);
             trapFile.events(this, symbol.GetName(), ContainingType, type.TypeRef, Create(Context, symbol.OriginalDefinition));

csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs

@@ -30,7 +30,7 @@ public override void Populate(TextWriter trapFile)
             PopulateMetadataHandle(trapFile);
             PopulateAttributes();
             ContainingType.PopulateGenerics();
-            PopulateNullability(trapFile, symbol.NullableAnnotation);
+            PopulateNullability(trapFile, symbol.GetAnnotatedType());
 
             Field unboundFieldKey = Field.Create(Context, symbol.OriginalDefinition);
             trapFile.fields(this, (symbol.IsConst ? 2 : 1), symbol.Name, ContainingType, Type.Type.TypeRef, unboundFieldKey);

csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs

@@ -14,7 +14,7 @@ protected Indexer(Context cx, IPropertySymbol init)
 
         public override void Populate(TextWriter trapFile)
         {
-            PopulateNullability(trapFile, symbol.NullableAnnotation);
+            PopulateNullability(trapFile, symbol.GetAnnotatedType());
 
             var type = Type.Create(Context, symbol.Type);
             trapFile.indexers(this, symbol.GetName(useMetadataName: true), ContainingType, type.TypeRef, OriginalDefinition);

csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalVariable.cs

@@ -31,7 +31,7 @@ public override void Populate(TextWriter trapFile)
         {
             if (symbol is ILocalSymbol local)
             {
-                PopulateNullability(trapFile, local.NullableAnnotation);
+                PopulateNullability(trapFile, local.GetAnnotatedType());
                 if (local.IsRef)
                     trapFile.type_annotation(this, Kinds.TypeAnnotation.Ref);
             }

csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs

@@ -264,7 +264,7 @@ public static Method Create(Context cx, IMethodSymbol methodDecl)
 
             var methodKind = methodDecl.MethodKind;
 
-            if(methodKind == MethodKind.ExplicitInterfaceImplementation)
+            if (methodKind == MethodKind.ExplicitInterfaceImplementation)
             {
                 // Retrieve the original method kind
                 methodKind = methodDecl.ExplicitInterfaceImplementations.Select(m => m.MethodKind).FirstOrDefault();
@@ -345,11 +345,12 @@ protected void PopulateGenerics(TextWriter trapFile)
                     foreach (var tp in symbol.GetAnnotatedTypeArguments())
                     {
                         trapFile.type_arguments(Type.Create(Context, tp.Symbol), child, this);
-                        var ta = tp.Nullability.GetTypeAnnotation();
-                        if (ta != Kinds.TypeAnnotation.None)
-                            trapFile.type_argument_annotation(this, child, ta);
                         child++;
                     }
+
+                    var nullability = new Nullability(symbol);
+                    if (!nullability.IsOblivious)
+                        trapFile.type_nullability(this, NullabilityEntity.Create(Context, nullability));
                 }
                 else
                 {
@@ -380,7 +381,7 @@ protected void PopulateMethod(TextWriter trapFile)
             PopulateMethodBody(trapFile);
             PopulateGenerics(trapFile);
             PopulateMetadataHandle(trapFile);
-            PopulateNullability(trapFile, symbol.ReturnNullableAnnotation);
+            PopulateNullability(trapFile, symbol.GetAnnotatedReturnType());
         }
 
         public override TrapStackBehaviour TrapStackBehaviour => TrapStackBehaviour.PushesLabel;

csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs

@@ -103,7 +103,7 @@ string Name
         public override void Populate(TextWriter trapFile)
         {
             PopulateAttributes();
-            PopulateNullability(trapFile, symbol.NullableAnnotation);
+            PopulateNullability(trapFile, symbol.GetAnnotatedType());
             PopulateRefKind(trapFile, symbol.RefKind);
 
             if (symbol.Name != Original.symbol.Name)

csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs

@@ -28,7 +28,7 @@ public override void Populate(TextWriter trapFile)
             PopulateAttributes();
             PopulateModifiers(trapFile);
             BindComments();
-            PopulateNullability(trapFile, symbol.NullableAnnotation);
+            PopulateNullability(trapFile, symbol.GetAnnotatedType());
             PopulateRefKind(trapFile, symbol.RefKind);
 
             var type = Type.Create(Context, symbol.Type);

csharp/extractor/Semmle.Extraction.CSharp/Entities/Symbol.cs

@@ -28,11 +28,13 @@ protected void PopulateAttributes()
                 Attribute.ExtractAttributes(Context, symbol, this);
         }
 
-        protected void PopulateNullability(TextWriter trapFile, NullableAnnotation annotation)
+        protected void PopulateNullability(TextWriter trapFile, AnnotatedTypeSymbol type)
         {
-            var ta = annotation.GetTypeAnnotation();
-            if (ta != Kinds.TypeAnnotation.None)
-                trapFile.type_annotation(this, ta);
+            var n = NullabilityEntity.Create(Context, Nullability.Create(type));
+            if (!type.HasObliviousNullability())
+            {
+                trapFile.type_nullability(this, n);
+            }
         }
 
         protected void PopulateRefKind(TextWriter trapFile, RefKind kind)

csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/ArrayType.cs

@@ -27,13 +27,11 @@ public override void Populate(TextWriter trapFile)
         {
             trapFile.array_element_type(this, Dimension, Rank, element.Type.TypeRef);
             PopulateType(trapFile);
-            PopulateNullability(trapFile, symbol.ElementNullableAnnotation);
         }
 
         public override void WriteId(TextWriter trapFile)
         {
             trapFile.WriteSubId(element.Type);
-            trapFile.Write((int)symbol.ElementNullableAnnotation);
             symbol.BuildArraySuffix(trapFile);
             trapFile.Write(";type");
         }