C#: Fix extractor errors.

calumgrant · calumgrant · commit d84fcbeedb69 · 2019-05-07T18:01:36.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifier.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifier.cs
@@ -142,10 +142,9 @@ public static void ExtractModifiers(Context cx, IEntity key, ISymbol symbol)
                     // Sadly, these properties are internal so cannot be accessed directly.
                     // This seems to be a deficiency in the model.
                     var readonlyProperty = nt.GetType().GetProperty("IsReadOnly", BindingFlags.NonPublic | BindingFlags.Instance);
-                    var isByRefProperty = nt.GetType().GetProperty("IsByRefLikeType", BindingFlags.NonPublic | BindingFlags.Instance);
 
                     bool isReadOnly = (bool)readonlyProperty.GetValue(nt);
-                    bool isByRefLikeType = (bool)isByRefProperty.GetValue(nt);
+                    bool isByRefLikeType = nt.IsRefLikeType;
 
                     if (isReadOnly)
                         HasModifier(cx, key, "readonly");
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs
@@ -36,7 +36,7 @@ void Populate()
                     var nts = (NullableTypeSyntax)Syntax;
                     var nt = (NamedType)Type;
                     Emit(Loc ?? Syntax.GetLocation(), Parent, Type);
-                    Create(cx, nts.ElementType, this, nt.TypeArguments[0]);
+                    Create(cx, nts.ElementType, this, nt.symbol.IsReferenceType ? nt : nt.TypeArguments[0]);
                     return;
                 case SyntaxKind.TupleType:
                     var tts = (TupleTypeSyntax)Syntax;
