Merge pull request swiftlang#61804 from tshortli/break-cycle-frontend…

…-ide

IDE: Move compiler invocation utils to break CMake cycle with Frontend

include/swift/IDE/Utils.h

@@ -13,21 +13,20 @@
 #ifndef SWIFT_IDE_UTILS_H
 #define SWIFT_IDE_UTILS_H
 
-#include "llvm/ADT/PointerIntPair.h"
-#include "swift/Basic/LLVM.h"
 #include "swift/AST/ASTNode.h"
+#include "swift/AST/ASTPrinter.h"
 #include "swift/AST/DeclNameLoc.h"
 #include "swift/AST/Effects.h"
 #include "swift/AST/Module.h"
-#include "swift/AST/ASTPrinter.h"
-#include "swift/Frontend/FrontendOptions.h"
+#include "swift/Basic/LLVM.h"
 #include "swift/IDE/SourceEntityWalker.h"
 #include "swift/Parse/Token.h"
+#include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/VirtualFileSystem.h"
+#include <functional>
 #include <memory>
 #include <string>
-#include <functional>
 #include <vector>
 
 namespace llvm {
@@ -41,10 +40,8 @@ namespace clang {
 }
 
 namespace swift {
-  class ModuleDecl;
   class ValueDecl;
   class ASTContext;
-  class CompilerInvocation;
   class SourceFile;
   class TypeDecl;
   class SourceLoc;
@@ -84,20 +81,6 @@ SourceCompleteResult
 isSourceInputComplete(std::unique_ptr<llvm::MemoryBuffer> MemBuf, SourceFileKind SFKind);
 SourceCompleteResult isSourceInputComplete(StringRef Text, SourceFileKind SFKind);
 
-bool initCompilerInvocation(
-    CompilerInvocation &Invocation, ArrayRef<const char *> OrigArgs,
-    FrontendOptions::ActionType Action, DiagnosticEngine &Diags,
-    StringRef UnresolvedPrimaryFile,
-    llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem,
-    const std::string &swiftExecutablePath,
-    const std::string &runtimeResourcePath,
-    const std::string &diagnosticDocumentationPath, time_t sessionTimestamp,
-    std::string &Error);
-
-bool initInvocationByClangArguments(ArrayRef<const char *> ArgList,
-                                    CompilerInvocation &Invok,
-                                    std::string &Error);
-
 /// Visits all overridden declarations exhaustively from VD, including protocol
 /// conformances and clang declarations.
 void walkOverriddenDecls(const ValueDecl *VD,

include/swift/IDETool/CompileInstance.h

@@ -24,7 +24,6 @@
 namespace swift {
 
 class CompilerInstance;
-class CompilerInvocation;
 class DiagnosticConsumer;
 
 namespace ide {

include/swift/IDETool/CompilerInvocation.h

@@ -0,0 +1,41 @@
+//===--- CompilerInvocation.h ---------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2022 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_IDE_COMPILERINVOCATION_H
+#define SWIFT_IDE_COMPILERINVOCATION_H
+
+#include "swift/Frontend/Frontend.h"
+
+namespace swift {
+
+class CompilerInvocation;
+
+namespace ide {
+
+bool initCompilerInvocation(
+    CompilerInvocation &Invocation, ArrayRef<const char *> OrigArgs,
+    FrontendOptions::ActionType Action, DiagnosticEngine &Diags,
+    StringRef UnresolvedPrimaryFile,
+    llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem,
+    const std::string &swiftExecutablePath,
+    const std::string &runtimeResourcePath,
+    const std::string &diagnosticDocumentationPath, time_t sessionTimestamp,
+    std::string &Error);
+
+bool initInvocationByClangArguments(ArrayRef<const char *> ArgList,
+                                    CompilerInvocation &Invok,
+                                    std::string &Error);
+
+} // namespace ide
+} // namespace swift
+
+#endif // SWIFT_IDE_COMPILERINVOCATION_H

lib/Frontend/CMakeLists.txt

@@ -19,8 +19,8 @@ add_dependencies(swiftFrontend
 target_link_libraries(swiftFrontend PRIVATE
   swiftAST
   swiftConstExtract
+  swiftIDE
   swiftSIL
-  swiftMigrator
   swiftOption
   swiftSILGen
   swiftSILOptimizer

lib/FrontendTool/CMakeLists.txt

@@ -20,6 +20,7 @@ target_link_libraries(swiftFrontendTool PRIVATE
     swiftImmediate
     swiftIndex
     swiftIRGen
+    swiftMigrator
     swiftOption
     swiftPrintAsClang
     swiftSerialization