Merge commit '43d73cb0cc58' from swift/release/6.0 into stable/20230725

Author: git apple-llvm automerger

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -57,7 +57,6 @@
 #include "clang/Basic/TargetOptions.h"
 #include "clang/Driver/Driver.h"
 #include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
 #include "clang/Lex/Preprocessor.h"
 
 #include "clang/Lex/PreprocessorOptions.h"
@@ -1574,7 +1573,21 @@ bool ShouldUnique(StringRef arg) {
 
 // static
 void SwiftASTContext::AddExtraClangArgs(const std::vector<std::string> &source,
-                                        std::vector<std::string> &dest) {
+                                        std::vector<std::string> &dest,
+                                        bool cc1) {
+  // FIXME: Support for cc1 flags isn't complete.  The uniquing
+  // algortihm below does not work for cc1 flags. Since cc1 flags are
+  // not stable it's not feasible to keep a list of all multi-arg
+  // flags, for example. It also makes it difficult to correctly
+  // identify where workng directories and path remappings should
+  // applied. For all these reasons, using cc1 flags for anything but
+  // a local build with explicit modules and precise compiler
+  // invocations isn't supported yet.
+  if (cc1) {
+    dest.insert(dest.end(), source.begin(), source.end());
+    return;
+  }
+
   llvm::StringSet<> unique_flags;
   for (auto &arg : dest)
     unique_flags.insert(arg);
@@ -1766,14 +1779,8 @@ void SwiftASTContext::AddExtraClangArgs(
         eSeverityWarning,
         "Mixing and matching of driver and cc1 Clang options detected");
 
-  // If using direct cc1 flags, compute the arguments and return.
-  // Since this is cc1 flags, no driver overwrite can be applied.
-  if (importer_options.DirectClangCC1ModuleBuild) {
-    AddExtraClangCC1Args(ExtraArgs, importer_options.ExtraArgs);
-    return;
-  }
-
-  AddExtraClangArgs(ExtraArgs, importer_options.ExtraArgs);
+  AddExtraClangArgs(ExtraArgs, importer_options.ExtraArgs,
+                    importer_options.DirectClangCC1ModuleBuild);
   applyOverrideOptions(importer_options.ExtraArgs, overrideOpts);
   if (HasNonexistentExplicitModule(importer_options.ExtraArgs))
     RemoveExplicitModules(importer_options.ExtraArgs);
@@ -1785,73 +1792,6 @@ void SwiftASTContext::AddExtraClangArgs(
       });
 }
 
-void SwiftASTContext::AddExtraClangCC1Args(
-    const std::vector<std::string> &source, std::vector<std::string> &dest) {
-  clang::CompilerInvocation invocation;
-  llvm::SmallVector<const char *> clangArgs;
-  clangArgs.reserve(source.size());
-  llvm::for_each(source, [&](const std::string &Arg) {
-    // Workaround for the extra driver argument embedded in the swiftmodule by
-    // some swift compiler version. It always starts with `--target=` and it is
-    // not a valid cc1 option.
-    if (!StringRef(Arg).starts_with("--target="))
-      clangArgs.push_back(Arg.c_str());
-  });
-
-  std::string diags;
-  llvm::raw_string_ostream os(diags);
-  auto diagOpts = llvm::makeIntrusiveRefCnt<clang::DiagnosticOptions>();
-  clang::DiagnosticsEngine clangDiags(
-      new clang::DiagnosticIDs(), diagOpts,
-      new clang::TextDiagnosticPrinter(os, diagOpts.get()));
-
-  if (!clang::CompilerInvocation::CreateFromArgs(invocation, clangArgs,
-                                                 clangDiags)) {
-    // If cc1 arguments failed to parse, report diagnostics and return
-    // immediately.
-    AddDiagnostic(eSeverityError, diags);
-    // Disable direct-cc1 build as fallback.
-    GetClangImporterOptions().DirectClangCC1ModuleBuild = false;
-    return;
-  }
-
-  // Clear module cache key and other CAS options to load modules from disk
-  // directly.
-  invocation.getFrontendOpts().ModuleCacheKeys.clear();
-  invocation.getCASOpts() = clang::CASOptions();
-
-  // Remove non-existing modules in a systematic way.
-  bool module_missing = false;
-  auto CheckFileExists = [&](const char *file) {
-    if (!llvm::sys::fs::exists(file)) {
-      std::string m_description;
-      HEALTH_LOG_PRINTF("Nonexistent explicit module file %s", file);
-      module_missing = true;
-    }
-  };
-  llvm::for_each(invocation.getHeaderSearchOpts().PrebuiltModuleFiles,
-                 [&](const auto &mod) { CheckFileExists(mod.second.c_str()); });
-  llvm::for_each(invocation.getFrontendOpts().ModuleFiles,
-                 [&](const auto &mod) { CheckFileExists(mod.c_str()); });
-
-  // If missing, clear all the prebuilt module options and use implicit module
-  // build.
-  if (module_missing) {
-    invocation.getHeaderSearchOpts().PrebuiltModuleFiles.clear();
-    invocation.getFrontendOpts().ModuleFiles.clear();
-    invocation.getLangOpts().ImplicitModules = true;
-    invocation.getHeaderSearchOpts().ImplicitModuleMaps = true;
-  }
-
-  invocation.generateCC1CommandLine(
-      [&](const llvm::Twine &arg) { dest.push_back(arg.str()); });
-
-  // If cc1 arguments are parsed and generated correctly, set explicitly-built
-  // module since only explicit module build can use direct cc1 mode.
-  m_has_explicit_modules = true;
-  return;
-}
-
 void SwiftASTContext::AddUserClangArgs(TargetProperties &props) {
   Args args(props.GetSwiftExtraClangFlags());
   std::vector<std::string> user_clang_flags;

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.h

@@ -278,10 +278,8 @@ class SwiftASTContext : public TypeSystemSwift {
   /// apply the working directory to any relative paths.
   void AddExtraClangArgs(const std::vector<std::string> &ExtraArgs,
                          llvm::StringRef overrideOpts = "");
-  void AddExtraClangCC1Args(const std::vector<std::string>& source,
-                                std::vector<std::string>& dest);
   static void AddExtraClangArgs(const std::vector<std::string>& source,
-                                std::vector<std::string>& dest);
+                                std::vector<std::string>& dest, bool cc1);
   static std::string GetPluginServer(llvm::StringRef plugin_library_path);
   /// Removes nonexisting VFS overlay options.
   static void FilterClangImporterOptions(std::vector<std::string> &extra_args,

lldb/test/API/lang/swift/clangimporter/caching/Makefile

@@ -26,6 +26,4 @@ def test(self):
         self.expect("expression obj", DATA_TYPES_DISPLAYED_CORRECTLY,
                     substrs=["b ="])
         self.filecheck('platform shell cat "%s"' % log, __file__)
-### -cc1 should be round-tripped so there is no more `-cc1` in the extra args. Look for `-triple` which is a cc1 flag.
-#       CHECK:  SwiftASTContextForExpressions(module: "a", cu: "main.swift")::LogConfiguration() --     -triple
-#       CHECK-NOT: -cc1
+#       CHECK:  SwiftASTContextForExpressions(module: "a", cu: "main.swift")::LogConfiguration() --     -cc1

lldb/test/API/lang/swift/clangimporter/caching/TestSwiftClangImporterCaching.py

@@ -234,15 +234,15 @@ const std::vector<std::string> uniqued_flags = {
 TEST_F(ClangArgs, UniquingCollisionWithExistingFlags) {
   const std::vector<std::string> source = duplicated_flags;
   std::vector<std::string> dest = uniqued_flags;
-  SwiftASTContext::AddExtraClangArgs(source, dest);
+  SwiftASTContext::AddExtraClangArgs(source, dest, false);
 
   EXPECT_EQ(dest, uniqued_flags);
 }
 
 TEST_F(ClangArgs, UniquingCollisionWithAddedFlags) {
   const std::vector<std::string> source = duplicated_flags;
   std::vector<std::string> dest;
-  SwiftASTContext::AddExtraClangArgs(source, dest);
+  SwiftASTContext::AddExtraClangArgs(source, dest, false);
 
   EXPECT_EQ(dest, uniqued_flags);
 }
@@ -251,7 +251,7 @@ TEST_F(ClangArgs, DoubleDash) {
   // -v with all currently ignored arguments following.
   const std::vector<std::string> source{"-v", "--", "-Werror", ""};
   std::vector<std::string> dest;
-  SwiftASTContext::AddExtraClangArgs(source, dest);
+  SwiftASTContext::AddExtraClangArgs(source, dest, false);
 
   // Check that all ignored arguments got removed.
   EXPECT_EQ(dest, std::vector<std::string>({"-v"}));