IDE: Break CMake cycle involving IDE, FrontendTool, Frontend, and Migrator.

tshortli · tshortli · commit 58d82f03f64a · 2022-10-27T15:56:26.000-07:00
These libraries formed a strongly connected component in the CMake build graph. The weakest link I could find was from IDE to FrontendTool and Frontend, which was necessitated by the `CompileInstance` class (#40645). I moved a few files out of IDE into a new IDETools library to break the cycle.
diff --git a/include/swift/IDETool/CompileInstance.h b/include/swift/IDETool/CompileInstance.h
diff --git a/include/swift/IDETool/CompletionInstance.h b/include/swift/IDETool/CompletionInstance.h
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -32,6 +32,7 @@ add_subdirectory(Frontend)
 add_subdirectory(FrontendTool)
 add_subdirectory(Index)
 add_subdirectory(IDE)
+add_subdirectory(IDETool)
 add_subdirectory(Immediate)
 add_subdirectory(IRGen)
 add_subdirectory(LLVMPasses)
diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
@@ -18,6 +18,7 @@ add_dependencies(swiftFrontend
   SwiftOptions)
 target_link_libraries(swiftFrontend PRIVATE
   swiftAST
+  swiftConstExtract
   swiftSIL
   swiftMigrator
   swiftOption
diff --git a/lib/IDE/CMakeLists.txt b/lib/IDE/CMakeLists.txt
@@ -15,12 +15,9 @@ add_swift_host_library(swiftIDE STATIC
   CodeCompletionString.cpp
   CodeCompletionStringPrinter.cpp
   CommentConversion.cpp
-  CompileInstance.cpp
-  CompletionInstance.cpp
   CompletionLookup.cpp
   CompletionOverrideLookup.cpp
   ConformingMethodList.cpp
-  DependencyChecking.cpp
   ExprCompletion.cpp
   ExprContextAnalysis.cpp
   Formatting.cpp
@@ -45,8 +42,6 @@ target_link_libraries(swiftIDE PRIVATE
   swiftAST
   swiftClangImporter
   swiftDriver
-  swiftFrontend
-  swiftFrontendTool
   swiftIndex
   swiftParse
   swiftSema)
diff --git a/lib/IDETool/CMakeLists.txt b/lib/IDETool/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+add_swift_host_library(swiftIDETool STATIC
+  CompileInstance.cpp
+  CompletionInstance.cpp
+  DependencyChecking.cpp
+  )
+
+target_link_libraries(swiftIDETool PRIVATE
+  swiftAST
+  swiftDriver
+  swiftFrontend
+  swiftFrontendTool)
+
+set_swift_llvm_is_available(swiftIDETool)
diff --git a/lib/IDETool/CompileInstance.cpp b/lib/IDETool/CompileInstance.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/IDE/CompileInstance.h"
+#include "swift/IDETool/CompileInstance.h"
 
 #include "DependencyChecking.h"
 #include "swift/AST/ASTContext.h"
@@ -25,7 +25,6 @@
 #include "swift/Driver/FrontendUtil.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/FrontendTool/FrontendTool.h"
-#include "swift/IDE/Utils.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Parse/PersistentParserState.h"
 #include "swift/Subsystems.h"
diff --git a/lib/IDETool/CompletionInstance.cpp b/lib/IDETool/CompletionInstance.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/IDE/CompletionInstance.h"
+#include "swift/IDETool/CompletionInstance.h"
 
 #include "DependencyChecking.h"
 #include "swift/AST/ASTContext.h"
diff --git a/lib/IDETool/DependencyChecking.cpp b/lib/IDETool/DependencyChecking.cpp
diff --git a/lib/IDETool/DependencyChecking.h b/lib/IDETool/DependencyChecking.h
diff --git a/tools/SourceKit/lib/SwiftLang/CMakeLists.txt b/tools/SourceKit/lib/SwiftLang/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(SourceKitSwiftLang PRIVATE
   swiftFrontend
   swiftClangImporter
   swiftIDE
+  swiftIDETool
   swiftAST
   swiftMarkup
   swiftParse
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftCompile.cpp b/tools/SourceKit/lib/SwiftLang/SwiftCompile.cpp
@@ -15,7 +15,7 @@
 
 #include "SourceKit/Support/FileSystemProvider.h"
 
-#include "swift/IDE/CompileInstance.h"
+#include "swift/IDETool/CompileInstance.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/MemoryBuffer.h"
 
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp b/tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
@@ -23,7 +23,7 @@
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/IDE/CodeCompletionCache.h"
 #include "swift/IDE/CodeCompletionResultPrinter.h"
-#include "swift/IDE/CompletionInstance.h"
+#include "swift/IDETool/CompletionInstance.h"
 
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/MemoryBuffer.h"
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp b/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp
@@ -16,7 +16,7 @@
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/IDE/ConformingMethodList.h"
-#include "swift/IDE/CompletionInstance.h"
+#include "swift/IDETool/CompletionInstance.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Comment.h"
 #include "clang/AST/Decl.h"
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
@@ -26,9 +26,9 @@
 #include "swift/Config.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/IDE/CodeCompletionCache.h"
-#include "swift/IDE/CompletionInstance.h"
 #include "swift/IDE/SyntaxModel.h"
 #include "swift/IDE/Utils.h"
+#include "swift/IDETool/CompletionInstance.h"
 
 #include "clang/Lex/HeaderSearch.h"
 #include "clang/Lex/Preprocessor.h"
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h
@@ -24,10 +24,10 @@
 #include "swift/AST/DiagnosticConsumer.h"
 #include "swift/Basic/ThreadSafeRefCounted.h"
 #include "swift/IDE/CancellableResult.h"
-#include "swift/IDE/CompileInstance.h"
-#include "swift/IDE/CompletionInstance.h"
 #include "swift/IDE/Indenting.h"
 #include "swift/IDE/Refactoring.h"
+#include "swift/IDETool/CompileInstance.h"
+#include "swift/IDETool/CompletionInstance.h"
 #include "swift/Index/IndexSymbol.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/StringMap.h"
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp
@@ -15,8 +15,8 @@
 #include "SwiftEditorDiagConsumer.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
-#include "swift/IDE/CompletionInstance.h"
 #include "swift/IDE/TypeContextInfo.h"
+#include "swift/IDETool/CompletionInstance.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Comment.h"
 #include "clang/AST/Decl.h"
diff --git a/tools/swift-ide-test/CMakeLists.txt b/tools/swift-ide-test/CMakeLists.txt
@@ -12,6 +12,7 @@ target_link_libraries(swift-ide-test
                         swiftDriver
                         swiftFrontend
                         swiftIDE
+                        swiftIDETool
                         swiftCompilerModules)
 
 # If libxml2 is available, make it available for swift-ide-test.
diff --git a/tools/swift-ide-test/swift-ide-test.cpp b/tools/swift-ide-test/swift-ide-test.cpp
@@ -38,7 +38,6 @@
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/IDE/CodeCompletionResultPrinter.h"
 #include "swift/IDE/CommentConversion.h"
-#include "swift/IDE/CompletionInstance.h"
 #include "swift/IDE/ConformingMethodList.h"
 #include "swift/IDE/IDERequests.h"
 #include "swift/IDE/ModuleInterfacePrinting.h"
@@ -47,6 +46,7 @@
 #include "swift/IDE/SyntaxModel.h"
 #include "swift/IDE/TypeContextInfo.h"
 #include "swift/IDE/Utils.h"
+#include "swift/IDETool/CompletionInstance.h"
 #include "swift/Index/Index.h"
 #include "swift/Markup/Markup.h"
 #include "swift/Parse/ParseVersion.h"
