Merge pull request #10469 from hvitved/csharp/dotnet-run-tracer-fix

C#: Prepend `-p:UseSharedCompilation=false` instead of append for `dotnet run`

Author: hvitved

csharp/ql/integration-tests/all-platforms/dotnet_run/Program.cs

@@ -0,0 +1 @@
+Console.WriteLine(args.Length > 0 ? args[0] + ", " + args[1] : "");

csharp/ql/integration-tests/all-platforms/dotnet_run/dotnet_run.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

csharp/ql/integration-tests/all-platforms/dotnet_run/test.py

@@ -0,0 +1,17 @@
+from create_database_utils import *
+
+# no arguments
+run_codeql_database_create(['dotnet run'], test_db="test-db", db=None, lang="csharp")
+
+# no arguments, but `--`
+run_codeql_database_create(['dotnet clean', 'rm -rf test-db obj bin', 'dotnet run --'], test_db="test2-db", db=None, lang="csharp")
+
+# two arguments, no `--`
+run_codeql_database_create(['dotnet clean', 'rm -rf test2-db obj bin', 'dotnet run hello world'], test_db="test3-db", db=None, lang="csharp")
+
+# two arguments, and `--`
+run_codeql_database_create(['dotnet clean', 'rm -rf test3-db obj bin', 'dotnet run -- hello world'], test_db="test4-db", db=None, lang="csharp")
+
+# shared compilation enabled; tracer should override by changing the command
+# to `dotnet run -p:UseSharedCompilation=true -p:UseSharedCompilation=false -- hello world`
+run_codeql_database_create(['dotnet clean', 'rm -rf test4-db obj bin', 'dotnet run -p:UseSharedCompilation=true -- hello world'], test_db="test5-db", db=None, lang="csharp")

csharp/tools/tracing-config.lua

@@ -22,6 +22,7 @@ function RegisterExtractorPack(id)
         -- otherwise we do nothing.
         local match = false
         local needsSeparator = false;
+        local injectionIndex = nil;
         local argv = compilerArguments.argv
         if OperatingSystem == 'windows' then
             -- let's hope that this split matches the escaping rules `dotnet` applies to command line arguments
@@ -38,13 +39,60 @@ function RegisterExtractorPack(id)
                     match = true
                     break
                 end
+                if arg == 'run' then
+                    -- for `dotnet run`, we need to make sure that `-p:UseSharedCompilation=false` is
+                    -- not passed in as an argument to the program that is run
+                    match = true
+                    needsSeparator = true
+                    injectionIndex = i + 1
+                end
+            end
+            if arg == '--' then
+                needsSeparator = false
+                injectionIndex = i
+                break
             end
         end
         if match then
-            return {
-                order = ORDER_REPLACE,
-                invocation = BuildExtractorInvocation(id, compilerPath, compilerPath, compilerArguments, nil, { '-p:UseSharedCompilation=false' })
-            }
+            local injections = { '-p:UseSharedCompilation=false' }
+            if needsSeparator then
+                table.insert(injections, '--')
+            end
+            if injectionIndex == nil then
+                -- Simple case; just append at the end
+                return {
+                    order = ORDER_REPLACE,
+                    invocation = BuildExtractorInvocation(id, compilerPath, compilerPath, compilerArguments, nil,
+                        injections)
+                }
+            end
+
+            -- Complex case; splice injections into the middle of the command line
+            for i, injectionArg in ipairs(injections) do
+                table.insert(argv, injectionIndex + i - 1, injectionArg)
+            end
+
+            if OperatingSystem == 'windows' then
+                return {
+                    order = ORDER_REPLACE,
+                    invocation = {
+                        path = AbsolutifyExtractorPath(id, compilerPath),
+                        arguments = {
+                            commandLineString = table.concat(argv, " ")
+                        }
+                    }
+                }
+            else
+                return {
+                    order = ORDER_REPLACE,
+                    invocation = {
+                        path = AbsolutifyExtractorPath(id, compilerPath),
+                        arguments = {
+                            argv = argv
+                        }
+                    }
+                }
+            end
         end
         return nil
     end