C#: Update tracer arguments.

michaelnebel · michaelnebel · commit 27d10081710d · 2022-08-30T14:34:54.000+02:00
diff --git a/csharp/tools/linux64/compiler-tracing.spec b/csharp/tools/linux64/compiler-tracing.spec
@@ -3,12 +3,10 @@
   invoke ${config_dir}/Semmle.Extraction.CSharp.Driver
   prepend --compiler
   prepend "${compiler}"
-  prepend --cil
 **/mono*:
 **/dotnet:
   invoke ${config_dir}/Semmle.Extraction.CSharp.Driver
   prepend --dotnetexec
-  prepend --cil
 **/msbuild:
 **/xbuild:
   replace yes
diff --git a/csharp/tools/osx64/compiler-tracing.spec b/csharp/tools/osx64/compiler-tracing.spec
@@ -3,12 +3,10 @@
   invoke ${config_dir}/Semmle.Extraction.CSharp.Driver
   prepend --compiler
   prepend "${compiler}"
-  prepend --cil
 **/mono*:
 **/dotnet:
   invoke ${config_dir}/Semmle.Extraction.CSharp.Driver
   prepend --dotnetexec
-  prepend --cil
 **/msbuild:
 **/xbuild:
   replace yes
diff --git a/csharp/tools/tracing-config.lua b/csharp/tools/tracing-config.lua
@@ -51,7 +51,7 @@ function RegisterExtractorPack(id)
     local windowsMatchers = {
         DotnetMatcherBuild,
         CreatePatternMatcher({ '^csc.*%.exe$' }, MatchCompilerName, extractor, {
-            prepend = { '--cil', '--compiler', '"${compiler}"' },
+            prepend = {'--compiler', '"${compiler}"' },
             order = ORDER_BEFORE
         }),
         CreatePatternMatcher({ '^fakes.*%.exe$', 'moles.*%.exe' },
@@ -64,7 +64,7 @@ function RegisterExtractorPack(id)
 
             local seenCompilerCall = false
             local argv = NativeArgumentsToArgv(compilerArguments.nativeArgumentPointer)
-            local extractorArgs = { '--cil', '--compiler' }
+            local extractorArgs = { '--compiler' }
             for _, arg in ipairs(argv) do
                 if arg:match('csc%.dll$') then
                     seenCompilerCall = true
@@ -92,7 +92,7 @@ function RegisterExtractorPack(id)
         DotnetMatcherBuild,
         CreatePatternMatcher({ '^mcs%.exe$', '^csc%.exe$' }, MatchCompilerName,
             extractor, {
-            prepend = { '--cil', '--compiler', '"${compiler}"' },
+            prepend = { '--compiler', '"${compiler}"' },
             order = ORDER_BEFORE
         }), function(compilerName, compilerPath, compilerArguments, _languageId)
             if MatchCompilerName('^msbuild$', compilerName, compilerPath,
@@ -118,7 +118,7 @@ function RegisterExtractorPack(id)
 
             local seenCompilerCall = false
             local argv = compilerArguments.argv
-            local extractorArgs = { '--cil', '--compiler' }
+            local extractorArgs = { '--compiler' }
             for _, arg in ipairs(argv) do
                 if arg:match('csc%.dll$') or arg:match('csc%.exe$') or arg:match('mcs%.exe$') then
                     seenCompilerCall = true
diff --git a/csharp/tools/win64/compiler-tracing.spec b/csharp/tools/win64/compiler-tracing.spec
@@ -6,8 +6,6 @@
   invoke ${config_dir}\Semmle.Extraction.CSharp.Driver.exe
   prepend --compiler
   prepend "${compiler}"
-  prepend --cil
 **\dotnet.exe:
   invoke ${config_dir}\Semmle.Extraction.CSharp.Driver.exe
   prepend --dotnetexec
-  prepend --cil
