Merge pull request #30393 from bitjammer/acgarland/rdar-59262057-ssge-maccatalyst

[SymbolGraph] Add macCatalyst compatibility

Author: bitjammer

include/swift/Frontend/Frontend.h

@@ -203,6 +203,12 @@ class CompilerInvocation {
 
   void setRuntimeResourcePath(StringRef Path);
 
+  /// If we haven't explicitly passed -prebuilt-module-cache-path, set it to
+  /// the default value of <resource-dir>/<platform>/prebuilt-modules.
+  /// @note This should be called once, after search path options and frontend
+  ///       options have been parsed.
+  void setDefaultPrebuiltCacheIfNecessary();
+
   /// Computes the runtime resource path relative to the given Swift
   /// executable.
   static void computeRuntimeResourcePathFromExecutablePath(

lib/Frontend/CompilerInvocation.cpp

@@ -59,30 +59,24 @@ void CompilerInvocation::setMainExecutablePath(StringRef Path) {
   DiagnosticOpts.DiagnosticDocumentationPath = DiagnosticDocsPath.str();
 }
 
-/// If we haven't explicitly passed -prebuilt-module-cache-path, set it to
-/// the default value of <resource-dir>/<platform>/prebuilt-modules.
-/// @note This should be called once, after search path options and frontend
-///       options have been parsed.
-static void setDefaultPrebuiltCacheIfNecessary(
-  FrontendOptions &frontendOpts, const SearchPathOptions &searchPathOpts,
-  const llvm::Triple &triple) {
-
-  if (!frontendOpts.PrebuiltModuleCachePath.empty())
+void CompilerInvocation::setDefaultPrebuiltCacheIfNecessary() {
+
+  if (!FrontendOpts.PrebuiltModuleCachePath.empty())
     return;
-  if (searchPathOpts.RuntimeResourcePath.empty())
+  if (SearchPathOpts.RuntimeResourcePath.empty())
     return;
 
-  SmallString<64> defaultPrebuiltPath{searchPathOpts.RuntimeResourcePath};
+  SmallString<64> defaultPrebuiltPath{SearchPathOpts.RuntimeResourcePath};
   StringRef platform;
-  if (tripleIsMacCatalystEnvironment(triple)) {
+  if (tripleIsMacCatalystEnvironment(LangOpts.Target)) {
     // The prebuilt cache for macCatalyst is the same as the one for macOS, not iOS
     // or a separate location of its own.
     platform = "macosx";
   } else {
-    platform = getPlatformNameForTriple(triple);
+    platform = getPlatformNameForTriple(LangOpts.Target);
   }
   llvm::sys::path::append(defaultPrebuiltPath, platform, "prebuilt-modules");
-  frontendOpts.PrebuiltModuleCachePath = defaultPrebuiltPath.str();
+  FrontendOpts.PrebuiltModuleCachePath = defaultPrebuiltPath.str();
 }
 
 static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts,
@@ -1599,8 +1593,7 @@ bool CompilerInvocation::parseArgs(
   }
 
   updateRuntimeLibraryPaths(SearchPathOpts, LangOpts.Target);
-  setDefaultPrebuiltCacheIfNecessary(FrontendOpts, SearchPathOpts,
-                                     LangOpts.Target);
+  setDefaultPrebuiltCacheIfNecessary();
 
   // Now that we've parsed everything, setup some inter-option-dependent state.
   setIRGenOutputOptsFromFrontendOptions(IRGenOpts, FrontendOpts);

tools/driver/swift_symbolgraph_extract_main.cpp

@@ -38,6 +38,10 @@ static llvm::cl::list<std::string>
 FrameworkSearchPaths("F", llvm::cl::desc("Add a directory to the framework search paths"), llvm::cl::ZeroOrMore,
                      llvm::cl::cat(Category));
 
+static llvm::cl::list<std::string>
+SystemFrameworkSearchPaths("Fsystem", llvm::cl::desc("Add directory to system framework search path"), llvm::cl::ZeroOrMore,
+                     llvm::cl::cat(Category));
+
 static llvm::cl::list<std::string>
 LibrarySearchPaths("L", llvm::cl::desc("Add a directory to the library search paths"), llvm::cl::ZeroOrMore,
                    llvm::cl::cat(Category));
@@ -75,6 +79,11 @@ static llvm::cl::list<std::string>
 Xcc("Xcc", llvm::cl::desc("Pass the following command-line flag to Clang"),
          llvm::cl::cat(Category));
 
+static llvm::cl::opt<std::string>
+ResourceDir("resource-dir",
+            llvm::cl::desc("Override the directory that holds the compiler resource files"),
+            llvm::cl::cat(Category));
+
 static llvm::cl::opt<std::string>
 OutputDir("output-dir", llvm::cl::desc("Symbol Graph JSON Output Directory (Required)"), llvm::cl::cat(Category));
 } // end namespace options
@@ -132,6 +141,9 @@ int swift_symbolgraph_extract_main(ArrayRef<const char *> Args, const char *Argv
   Invocation.setMainExecutablePath(
       llvm::sys::fs::getMainExecutable(Argv0, MainAddr));
   Invocation.setModuleName("swift_symbolgraph_extract");
+  if (!options::ResourceDir.empty()) {
+    Invocation.setRuntimeResourcePath(options::ResourceDir);
+  }
   Invocation.setSDKPath(options::SDK);
   Invocation.setTargetTriple(options::Target);
 
@@ -143,6 +155,9 @@ int swift_symbolgraph_extract_main(ArrayRef<const char *> Args, const char *Argv
   for (const auto &Path : options::FrameworkSearchPaths) {
     FrameworkSearchPaths.push_back({ Path, /*isSystem*/ false});
   }
+  for (const auto &Path : options::SystemFrameworkSearchPaths) {
+    FrameworkSearchPaths.push_back({ Path, /*isSystem*/ true });
+  }
   Invocation.setFrameworkSearchPaths(FrameworkSearchPaths);
   Invocation.getSearchPathOptions().LibrarySearchPaths = options::LibrarySearchPaths;
   Invocation.setImportSearchPaths(options::ImportSearchPaths);
@@ -154,6 +169,7 @@ int swift_symbolgraph_extract_main(ArrayRef<const char *> Args, const char *Argv
 
   Invocation.setClangModuleCachePath(options::ModuleCachePath);
   Invocation.getClangImporterOptions().ModuleCachePath = options::ModuleCachePath;
+  Invocation.setDefaultPrebuiltCacheIfNecessary();
 
   if (!options::SwiftVersion.empty()) {
     using version::Version;