Update Lua tracing configs.

csharp/tools/tracing-config.lua

@@ -3,10 +3,14 @@ function RegisterExtractorPack(id)
                           'Semmle.Extraction.CSharp.Driver'
     if OperatingSystem == 'windows' then extractor = extractor .. '.exe' end
     local windowsMatchers = {
-        CreatePatternMatcher({'^dotnet%.exe$'}, MatchCompilerName, extractor,
+        CreatePatternMatcher({'^dotnet%.exe$'}, MatchCompilerName, extractor, {
-                             {prepend = {'--dotnetexec', '--cil'}}),
+            prepend = {'--dotnetexec', '--cil'},
+            order = ORDER_BEFORE
+        }),
         CreatePatternMatcher({'^csc.*%.exe$'}, MatchCompilerName, extractor, {
-            prepend = {'--compiler', '"${compiler}"', '--cil'}
+            prepend = {'--compiler', '"${compiler}"', '--cil'},
+            order = ORDER_BEFORE
+
         }),
         CreatePatternMatcher({'^fakes.*%.exe$', 'moles.*%.exe'},
                              MatchCompilerName, nil, {trace = false})
@@ -14,23 +18,28 @@ function RegisterExtractorPack(id)
     local posixMatchers = {
         CreatePatternMatcher({'^mcs%.exe$', '^csc%.exe$'}, MatchCompilerName,
                              extractor, {
-            prepend = {'--compiler', '"${compiler}"', '--cil'}
+            prepend = {'--compiler', '"${compiler}"', '--cil'},
+            order = ORDER_BEFORE
+
         }),
         CreatePatternMatcher({'^mono', '^dotnet$'}, MatchCompilerName,
-                             extractor, {prepend = {'--dotnetexec', '--cil'}}),
+                             extractor, {
-        function(compilerName, compilerPath, compilerArguments, _languageId)
+            prepend = {'--dotnetexec', '--cil'},
+            order = ORDER_BEFORE
+        }), function(compilerName, compilerPath, compilerArguments, _languageId)
             if MatchCompilerName('^msbuild$', compilerName, compilerPath,
                                  compilerArguments) or
                 MatchCompilerName('^xbuild$', compilerName, compilerPath,
                                   compilerArguments) then
                 return {
-                    replace = true,
+                    order = ORDER_REPLACE,
-                    invocations = {
+                    invocation = BuildExtractorInvocation(id, compilerPath,
-                        BuildExtractorInvocation(id, compilerPath, compilerPath,
+                                                          compilerPath,
-                                                 compilerArguments, nil, {
+                                                          compilerArguments,
+                                                          nil, {
                         '/p:UseSharedCompilation=false'
                     })
-                    }
+
                 }
             end
         end

swift/tools/tracing-config.lua

@@ -13,8 +13,12 @@ function RegisterExtractorPack(id)
         table.remove(compilerArguments.argv, 1)
 
         -- Skip "info" queries in case there is nothing to extract
-        if compilerArguments.argv[1] == '-print-target-info' then return nil end
+        if compilerArguments.argv[1] == '-print-target-info' then
-        if compilerArguments.argv[1] == '-emit-supported-features' then return nil end
+            return nil
+        end
+        if compilerArguments.argv[1] == '-emit-supported-features' then
+            return nil
+        end
 
         -- Skip actions in which we cannot extract anything
         if compilerArguments.argv[1] == '-merge-modules' then return nil end
@@ -22,7 +26,8 @@ function RegisterExtractorPack(id)
         return {
             trace = true,
             replace = false,
-            invocations = {{path = swiftExtractor, arguments = compilerArguments}}
+            order = ORDER_AFTER,
+            invocation = {path = swiftExtractor, arguments = compilerArguments}
         }
     end
     return {SwiftMatcher}