C#: Avoid NPE in Parameter.Populate

Author: hvitved

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

@@ -10,13 +10,15 @@ namespace Semmle.Extraction.CSharp.Entities
 {
     internal class Parameter : CachedSymbol<IParameterSymbol>, IExpressionParentEntity
     {
-        protected IEntity? Parent { get; set; }
+        protected IEntity Parent { get; set; }
         protected Parameter Original { get; }
 
         protected Parameter(Context cx, IParameterSymbol init, IEntity? parent, Parameter? original)
             : base(cx, init)
         {
-            Parent = parent;
+            Parent = parent
+                        ?? Method.Create(Context, Symbol.ContainingSymbol as IMethodSymbol)
+                        ?? throw new InternalError(Symbol, "Couldn't get parent of symbol.");
             Original = original ?? this;
         }
 
@@ -63,12 +65,6 @@ public static Parameter Create(Context cx, IParameterSymbol param) =>
 
         public override void WriteId(EscapingTextWriter trapFile)
         {
-            if (Parent is null)
-                Parent = Method.Create(Context, Symbol.ContainingSymbol as IMethodSymbol);
-
-            if (Parent is null)
-                throw new InternalError(Symbol, "Couldn't get parent of symbol.");
-
             trapFile.WriteSubId(Parent);
             trapFile.Write('_');
             trapFile.Write(Ordinal);
@@ -99,7 +95,7 @@ public override void Populate(TextWriter trapFile)
                 Context.ModelError(Symbol, "Inconsistent parameter declaration");
 
             var type = Type.Create(Context, Symbol.Type);
-            trapFile.@params(this, Name, type.TypeRef, Ordinal, ParamKind, Parent!, Original);
+            trapFile.@params(this, Name, type.TypeRef, Ordinal, ParamKind, Parent, Original);
 
             foreach (var l in Symbol.Locations)
                 trapFile.param_location(this, Context.CreateLocation(l));
@@ -232,11 +228,11 @@ public override void Populate(TextWriter trapFile)
         {
             var typeKey = VarargsType.Create(Context);
             // !! Maybe originaldefinition is wrong
-            trapFile.@params(this, "", typeKey, Ordinal, Kind.None, Parent!, this);
+            trapFile.@params(this, "", typeKey, Ordinal, Kind.None, Parent, this);
             trapFile.param_location(this, GeneratedLocation.Create(Context));
         }
 
-        protected override int Ordinal => ((Method)Parent!).OriginalDefinition.Symbol.Parameters.Length;
+        protected override int Ordinal => ((Method)Parent).OriginalDefinition.Symbol.Parameters.Length;
 
         public override int GetHashCode()
         {