Merge branch 'main' into rust-improve-cfg

Author: paldepind

csharp/downgrades/a2bda57dbc6eea94c50128522aae536e8edd5a3c/old.dbscheme

@@ -0,0 +1,2 @@
+description: Add `cil` and `dotnet` related relations and types.
+compatibility: backwards

csharp/downgrades/a2bda57dbc6eea94c50128522aae536e8edd5a3c/semmlecode.csharp.dbscheme

@@ -144,50 +144,5 @@ public ExpressionSyntax? ExpressionBody
         public override bool NeedsPopulation => Context.Defines(Symbol);
 
         public Extraction.Entities.Location Location => Context.CreateLocation(ReportingLocation);
-
-        protected void PopulateMetadataHandle(TextWriter trapFile)
-        {
-            var handle = MetadataHandle;
-
-            if (handle.HasValue)
-                trapFile.metadata_handle(this, Location, MetadataTokens.GetToken(handle.Value));
-        }
-
-        private static System.Reflection.PropertyInfo? GetPropertyInfo(object o, string name)
-        {
-            return o.GetType().GetProperty(name, System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.GetProperty);
-        }
-
-        public Handle? MetadataHandle
-        {
-            get
-            {
-                var handleProp = GetPropertyInfo(Symbol, "Handle");
-                object handleObj = Symbol;
-
-                if (handleProp is null)
-                {
-                    var underlyingSymbolProp = GetPropertyInfo(Symbol, "UnderlyingSymbol");
-                    if (underlyingSymbolProp?.GetValue(Symbol) is object underlying)
-                    {
-                        handleProp = GetPropertyInfo(underlying, "Handle");
-                        handleObj = underlying;
-                    }
-                }
-
-                if (handleProp is not null)
-                {
-                    switch (handleProp.GetValue(handleObj))
-                    {
-                        case MethodDefinitionHandle md: return md;
-                        case TypeDefinitionHandle td: return td;
-                        case PropertyDefinitionHandle pd: return pd;
-                        case FieldDefinitionHandle fd: return fd;
-                    }
-                }
-
-                return null;
-            }
-        }
     }
 }

csharp/downgrades/a2bda57dbc6eea94c50128522aae536e8edd5a3c/upgrade.properties

@@ -26,7 +26,6 @@ private Field(Context cx, IFieldSymbol init)
 
         public override void Populate(TextWriter trapFile)
         {
-            PopulateMetadataHandle(trapFile);
             PopulateAttributes();
             ContainingType!.PopulateGenerics();
             PopulateNullability(trapFile, Symbol.GetAnnotatedType());

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

@@ -360,7 +360,6 @@ protected void PopulateMethod(TextWriter trapFile)
             PopulateParameters();
             PopulateMethodBody(trapFile);
             PopulateGenerics(trapFile);
-            PopulateMetadataHandle(trapFile);
             PopulateNullability(trapFile, Symbol.GetAnnotatedReturnType());
         }
 

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

@@ -34,7 +34,6 @@ public override void WriteId(EscapingTextWriter trapFile)
 
         public override void Populate(TextWriter trapFile)
         {
-            PopulateMetadataHandle(trapFile);
             PopulateAttributes();
             PopulateModifiers(trapFile);
             BindComments();

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

@@ -77,7 +77,6 @@ public Kinds.TypeKind GetTypeKind(Context cx, bool constructUnderlyingTupleType)
 
         protected void PopulateType(TextWriter trapFile, bool constructUnderlyingTupleType = false)
         {
-            PopulateMetadataHandle(trapFile);
             PopulateAttributes();
 
             trapFile.Write("types(");

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

@@ -233,9 +233,6 @@ internal static void localvar_location(this TextWriter trapFile, LocalVariable v
         internal static void localvars(this TextWriter trapFile, LocalVariable key, VariableKind kind, string name, int @var, Type type, Expression expr) =>
             trapFile.WriteTuple("localvars", key, (int)kind, name, @var, type, expr);
 
-        public static void metadata_handle(this TextWriter trapFile, IEntity entity, Location assembly, int handleValue) =>
-            trapFile.WriteTuple("metadata_handle", entity, assembly, handleValue);
-
         internal static void method_location(this TextWriter trapFile, Method method, Location location) =>
             trapFile.WriteTuple("method_location", method, location);
 

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

@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* C#: Remove all CIL tables and related QL library functionality.