Merge pull request #11571 from github/redsun82/swift-open-redirection

Swift: generalize open redirection on both platforms and rework output rewriting

Author: redsun82

misc/bazel/workspace.bzl

@@ -1,47 +1,9 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-
-_swift_prebuilt_version = "swift-5.7.1-RELEASE.44582.104"
-_swift_sha_map = {
-  "Linux-X64": "8d94f2d75f2aa9ee8e5421318d2f07b27e095127c9be0156794a88d8e9a0f19a",
-  "macOS-X64": "5f0550d2924e7071d006a0c9802acbd9a11f0017073e4a1eb27b7ddc4764f3f2",
-}
-
-_swift_arch_map = {
-    "Linux-X64": "linux",
-    "macOS-X64": "darwin_x86_64",
-}
+load("//swift/third_party:load.bzl", load_swift_dependencies = "load_dependencies")
 
 def codeql_workspace(repository_name = "codeql"):
-    for repo_arch, arch in _swift_arch_map.items():
-        sha256 = _swift_sha_map[repo_arch]
-
-        http_archive(
-            name = "swift_prebuilt_%s" % arch,
-            url = "https://github.com/dsp-testing/codeql-swift-artifacts/releases/download/%s/swift-prebuilt-%s.zip" % (
-                _swift_prebuilt_version,
-                repo_arch,
-            ),
-            build_file = "@%s//swift/third_party/swift-llvm-support:BUILD.swift-prebuilt.bazel" % repository_name,
-            sha256 = sha256,
-        )
-
-    http_archive(
-        name = "fishhook",
-        url = "https://github.com/facebook/fishhook/archive/aadc161ac3b80db07a9908851839a17ba63a9eb1.zip",
-        build_file = "@%s//swift/third_party/fishhook:BUILD.fishhook.bazel" % repository_name,
-        strip_prefix = "fishhook-aadc161ac3b80db07a9908851839a17ba63a9eb1",
-        sha256 = "9f2cdee6dcc2039d4c47d25ab5141fe0678ce6ed27ef482cab17fe9fa38a30ce",
-    )
-
-    http_archive(
-        name = "picosha2",
-        url = "https://github.com/okdshin/PicoSHA2/archive/27fcf6979298949e8a462e16d09a0351c18fcaf2.zip",
-        strip_prefix = "PicoSHA2-27fcf6979298949e8a462e16d09a0351c18fcaf2",
-        build_file = "@%s//swift/third_party/picosha2:BUILD.picosha2.bazel" % repository_name,
-        sha256 = "d6647ca45a8b7bdaf027ecb68d041b22a899a0218b7206dee755c558a2725abb",
-    )
-
+    load_swift_dependencies(repository_name)
     maybe(
         repo_rule = http_archive,
         name = "rules_pkg",

swift/extractor/BUILD.bazel

@@ -9,6 +9,7 @@ swift_cc_binary(
         "*.cpp",
     ]),
     deps = [
+        "//swift/extractor/config",
         "//swift/extractor/infra",
         "//swift/extractor/invocation",
         "//swift/extractor/remapping",

swift/extractor/SwiftExtractor.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "swift/extractor/SwiftExtractorConfiguration.h"
+#include "swift/extractor/config/SwiftExtractorConfiguration.h"
 #include <swift/AST/SourceFile.h>
 #include <swift/Frontend/Frontend.h>
 #include <memory>

swift/extractor/TargetTrapFile.cpp

@@ -11,11 +11,6 @@ std::optional<TargetFile> createTargetTrapFile(const SwiftExtractorConfiguration
     for (const auto& opt : configuration.frontendOptions) {
       *ret << "  " << std::quoted(opt) << " \\\n";
     }
-    *ret << "\n*/\n"
-            "/* swift-frontend-args:\n";
-    for (const auto& opt : configuration.patchedFrontendOptions) {
-      *ret << "  " << std::quoted(opt) << " \\\n";
-    }
     *ret << "\n*/\n";
   }
   return ret;

swift/extractor/TargetTrapFile.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "swift/extractor/infra/file/TargetFile.h"
-#include "swift/extractor/SwiftExtractorConfiguration.h"
+#include "swift/extractor/config/SwiftExtractorConfiguration.h"
 
 namespace codeql {
 

swift/extractor/config/BUILD.bazel

@@ -0,0 +1,8 @@
+load("//swift:rules.bzl", "swift_cc_library")
+
+swift_cc_library(
+    name = "config",
+    srcs = glob(["*.cpp"]),
+    hdrs = glob(["*.h"]),
+    visibility = ["//swift:__subpackages__"],
+)

swift/extractor/SwiftExtractorConfiguration.h renamed to swift/extractor/config/SwiftExtractorConfiguration.h

@@ -17,9 +17,7 @@ struct SwiftExtractorConfiguration {
   std::filesystem::path scratchDir;
 
   // The original arguments passed to the extractor. Used for debugging.
-  std::vector<std::string> frontendOptions;
-  // The patched arguments passed to the swift::performFrontend/ Used for debugging.
-  std::vector<std::string> patchedFrontendOptions;
+  std::vector<const char*> frontendOptions;
 
   // A temporary directory that contains TRAP files before they are moved into their final
   // destination.

swift/extractor/extractor.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [[ "$(uname)" == Darwin ]]; then
-  export DYLD_FALLBACK_LIBRARY_PATH=$(dirname "$0")
+  export DYLD_LIBRARY_PATH=$(dirname "$0")
 else
   export LD_LIBRARY_PATH=$(dirname "$0")
 fi

swift/extractor/infra/file/BUILD.bazel

@@ -5,7 +5,6 @@ swift_cc_library(
     srcs = glob(["*.cpp"]),
     hdrs = glob(["*.h"]) + [":path_hash_workaround"],
     visibility = ["//swift:__subpackages__"],
-    deps = ["@picosha2"],
 )
 
 genrule(