C#: Use the extractor option to decide, whether CIL should be enabled.

Author: michaelnebel

csharp/extractor/Semmle.Extraction.CSharp.Driver/Driver.cs

@@ -18,14 +18,11 @@ public static int Main(string[] args)
             if (args.Length > 0 && args[0] == "--dotnetexec")
             {
                 var compilerRegEx = new Regex(@"csc\.exe|mcs\.exe|csc\.dll", RegexOptions.Compiled);
-                var cil = args.Length > 1 && args[1] == "--cil";
-                for (var i = cil ? 2 : 1; i < args.Length; i++)
+                for (var i = 1; i < args.Length; i++)
                 {
                     if (compilerRegEx.IsMatch(args[i]))
                     {
                         var argsList = new List<string>();
-                        if (cil)
-                            argsList.Add("--cil");
                         argsList.Add("--compiler");
                         argsList.Add(args[i]);
                         if (i + 1 < args.Length)

csharp/extractor/Semmle.Extraction.CSharp.Standalone/Program.cs

@@ -56,7 +56,6 @@ public static int Main(string[] args)
             CSharp.Extractor.SetInvariantCulture();
 
             var options = Options.Create(args);
-            // options.CIL = true;  // To do: Enable this
 
             if (options.Help)
             {

csharp/extractor/Semmle.Extraction/Options.cs

@@ -28,7 +28,7 @@ public abstract class CommonOptions : ICommandLineOptions
         /// <summary>
         /// Holds if CIL should be extracted.
         /// </summary>
-        public bool CIL { get; private set; } = false;
+        public bool CIL { get; private set; } = true;
 
         /// <summary>
         /// Holds if assemblies shouldn't be extracted twice.
@@ -50,7 +50,6 @@ public abstract class CommonOptions : ICommandLineOptions
         /// </summary>
         public bool QlTest { get; private set; } = false;
 
-
         /// <summary>
         /// The compression algorithm used for trap files.
         /// </summary>
@@ -73,6 +72,9 @@ public virtual bool HandleOption(string key, string value)
                         return true;
                     }
                     return false;
+                case "cil":
+                    CIL = Boolean.Parse(value);
+                    return true;
                 default:
                     return false;
             }
@@ -97,9 +99,6 @@ public virtual bool HandleFlag(string flag, bool value)
                 case "cache":
                     Cache = value;
                     return true;
-                case "cil":
-                    CIL = value;
-                    return true;
                 case "pdb":
                     PDB = value;
                     CIL = true;

csharp/extractor/Semmle.Util/CommandLineOptions.cs

@@ -17,7 +17,7 @@ public interface ICommandLineOptions
         bool HandleOption(string key, string value);
 
         /// <summary>
-        /// Handle a flag of the form "--cil" or "--nocil"
+        /// Handle a flag of the form "--cache" or "--nocache"
         /// </summary>
         /// <param name="key">The name of the flag. This is case sensitive.</param>
         /// <param name="value">True if set, or false if prefixed by "--no"</param>
@@ -40,19 +40,22 @@ public interface ICommandLineOptions
 
     public static class OptionsExtensions
     {
+        private static readonly string[] ExtractorOptions = new[] { "trap_compression", "cil" };
         private static string? GetExtractorOption(string name) =>
             Environment.GetEnvironmentVariable($"CODEQL_EXTRACTOR_CSHARP_OPTION_{name.ToUpper()}");
 
         private static List<string> GetExtractorOptions()
         {
             var extractorOptions = new List<string>();
 
-            var trapCompression = GetExtractorOption("trap_compression");
-            if (!string.IsNullOrEmpty(trapCompression))
+            foreach (var option in ExtractorOptions)
             {
-                extractorOptions.Add($"--trap_compression:{trapCompression}");
+                var value = GetExtractorOption(option);
+                if (!string.IsNullOrEmpty(value))
+                {
+                    extractorOptions.Add($"--{option}:{value}");
+                }
             }
-
             return extractorOptions;
         }