Merge branch 'main' into henrymercer/delete-runner-part-2

src/codeql.ts

@@ -799,19 +799,12 @@ async function getCodeQLForCmd(
       config: Config,
       sourceRoot: string,
       processName: string | undefined,
-      featureEnablement: FeatureEnablement,
-      logger: Logger
+      featureEnablement: FeatureEnablement
     ) {
       const extraArgs = config.languages.map(
         (language) => `--language=${language}`
       );
-      const isGoExtractionReconciliationEnabled =
-        await util.isGoExtractionReconciliationEnabled(featureEnablement);
-      if (
-        config.languages.filter((l) =>
-          isTracedLanguage(l, isGoExtractionReconciliationEnabled, logger)
-        ).length > 0
-      ) {
+      if (config.languages.filter((l) => isTracedLanguage(l)).length > 0) {
         extraArgs.push("--begin-tracing");
         extraArgs.push(...(await getTrapCachingExtractorConfigArgs(config)));
         extraArgs.push(`--trace-process-name=${processName}`);
@@ -824,11 +817,7 @@ async function getCodeQLForCmd(
             CODEQL_VERSION_LUA_TRACER_CONFIG
           )) &&
           config.languages.includes(Language.go) &&
-          isTracedLanguage(
-            Language.go,
-            isGoExtractionReconciliationEnabled,
-            logger
-          ) &&
+          isTracedLanguage(Language.go) &&
           process.platform === "win32" &&
           !(await util.codeQlVersionAbove(
             this,
@@ -861,8 +850,12 @@ async function getCodeQLForCmd(
     async runAutobuild(language: Language) {
       const cmdName =
         process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh";
+      // The autobuilder for Swift is located in the experimental/ directory.
+      const possibleExperimentalDir =
+        language === Language.swift ? "experimental" : "";
       const autobuildCmd = path.join(
         path.dirname(cmd),
+        possibleExperimentalDir,
         language,
         "tools",
         cmdName