[DNM] Test linking against and using 's tooling library

Author: artemcm

tools/libSwiftScan/CMakeLists.txt

@@ -10,6 +10,14 @@ add_swift_host_library(libSwiftScan SHARED
   SwiftCaching.cpp
   HAS_SWIFT_MODULES)
 
+add_library(libSwiftScanDependencies INTERFACE)
+target_link_libraries(libSwiftScanDependencies INTERFACE
+  swiftDependencyScan
+  swiftDriverTool
+  swiftStaticMirror
+  swiftRemoteInspection
+  swiftCompilerModules)
+
 if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
   # Workaround for a linker crash related to autolinking: rdar://77839981
   set_property(TARGET libSwiftScan APPEND_STRING PROPERTY
@@ -21,11 +29,7 @@ add_dependencies(libSwiftScan
   swiftDependencyScan)
 
 target_link_libraries(libSwiftScan PRIVATE
-    swiftDependencyScan
-    swiftDriverTool
-    swiftStaticMirror
-    swiftRemoteInspection
-    swiftCompilerModules)
+    libSwiftScanDependencies)
 
 set_target_properties(libSwiftScan
     PROPERTIES

tools/swift-ide-test/CMakeLists.txt

@@ -1,3 +1,20 @@
+# Early swift-driver is built adjacent to the compiler (swift build dir)
+if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+  set(driver_package_configuration_dir "release")
+else()
+  set(driver_package_configuration_dir "debug")
+endif()
+
+message(STATUS "${CMAKE_BINARY_DIR}/../earlyswiftdriver-${SWIFT_HOST_VARIANT}-${SWIFT_HOST_VARIANT_ARCH}/${driver_package_configuration_dir}/cmake/modules/")
+message(STATUS "${CMAKE_BINARY_DIR}/../earlyswiftdriver-${SWIFT_HOST_VARIANT}-${SWIFT_HOST_VARIANT_ARCH}/${driver_package_configuration_dir}/dependencies/swift-tools-support-core/cmake/modules/")
+
+set(SwiftDriver_DIR
+    "${CMAKE_BINARY_DIR}/../earlyswiftdriver-${SWIFT_HOST_VARIANT}-${SWIFT_HOST_VARIANT_ARCH}/${driver_package_configuration_dir}/cmake/modules/")
+set(TSC_DIR    "${CMAKE_BINARY_DIR}/../earlyswiftdriver-${SWIFT_HOST_VARIANT}-${SWIFT_HOST_VARIANT_ARCH}/${driver_package_configuration_dir}/dependencies/swift-tools-support-core/cmake/modules/")
+find_package(TSC CONFIG)
+find_package(SwiftDriver CONFIG)
+
+
 add_swift_host_tool(swift-ide-test
   swift-ide-test.cpp
   ModuleAPIDiff.cpp
@@ -6,14 +23,29 @@ add_swift_host_tool(swift-ide-test
   THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY
   HAS_SWIFT_MODULES
 )
+
+set_property(
+  TARGET swift-ide-test
+  APPEND PROPERTY INSTALL_RPATH "${CMAKE_BINARY_DIR}/../earlyswiftdriver-${SWIFT_HOST_VARIANT}-${SWIFT_HOST_VARIANT_ARCH}/${driver_package_configuration_dir}/lib/"
+)
+set_property(
+  TARGET swift-ide-test
+  APPEND PROPERTY INSTALL_RPATH "${CMAKE_BINARY_DIR}/../earlyswiftdriver-${SWIFT_HOST_VARIANT}-${SWIFT_HOST_VARIANT_ARCH}/${driver_package_configuration_dir}/dependencies/swift-tools-support-core/lib/"
+)
+
 target_link_libraries(swift-ide-test
                       PRIVATE
                         swiftAST
                         swiftDriver
+                        SwiftDriver
                         swiftFrontend
                         swiftIDE
                         swiftIDETool
-                        swiftCompilerModules)
+                        swiftCompilerModules
+                        libSwiftScanInterface)
+target_sources(swift-ide-test
+  PRIVATE
+  $<TARGET_OBJECTS:libSwiftScan>)
 
 # If libxml2 is available, make it available for swift-ide-test.
 if(LLVM_ENABLE_LIBXML2)

tools/swift-ide-test/swift-ide-test.cpp

@@ -4180,6 +4180,29 @@ static int doPrintUSRs(const CompilerInvocation &InitInvok,
   return 0;
 }
 
+extern "C" {
+  typedef enum {
+    SWIFTDRIVER_TOOLING_DIAGNOSTIC_ERROR = 0,
+    SWIFTDRIVER_TOOLING_DIAGNOSTIC_WARNING = 1,
+    SWIFTDRIVER_TOOLING_DIAGNOSTIC_REMARK = 2,
+    SWIFTDRIVER_TOOLING_DIAGNOSTIC_NOTE = 3
+  } swiftdriver_tooling_diagnostic_kind;
+  bool swift_getSingleFrontendInvocationFromDriverArgumentsV2(const char *, int, const char**, bool(int, const char**),
+							void(swiftdriver_tooling_diagnostic_kind, const char*), bool);
+}
+bool displayFrontendArgs(int FrontendArgC, const char ** FrontendArgV) {
+  llvm::outs() << "SwiftDriver (new) Frontend Arguments BEGIN\n";
+  for (int i = 0; i < FrontendArgC; ++i) {
+    llvm::outs() << FrontendArgV[i] << "\n";
+  }
+  llvm::outs() << "SwiftDriver (new) Frontend Arguments END\n";
+  //return CI.parseArgs(FrontendArgs, Diags);
+  return false;
+}
+void handleDiagnostic(swiftdriver_tooling_diagnostic_kind diagKind, const char * diagMessage) {
+  return;
+}
+
 static int doTestCreateCompilerInvocation(StringRef DriverPath,
                                           ArrayRef<const char *> Args,
                                           bool ForceNoOutputs) {
@@ -4201,6 +4224,18 @@ static int doTestCreateCompilerInvocation(StringRef DriverPath,
       },
       ForceNoOutputs);
 
+  {
+    const char **argList = (const char**)malloc(sizeof(const char*) * Args.size());
+    for (size_t i = 0; i < Args.size(); ++i) {
+      argList[i] = Args[i];
+    }
+    bool HadError = swift_getSingleFrontendInvocationFromDriverArgumentsV2(
+        DriverPath.str().c_str(), Args.size(), argList,
+        &displayFrontendArgs,
+        &handleDiagnostic,
+        ForceNoOutputs);
+  }
+
   if (HadError) {
     llvm::errs() << "error: unable to create a CompilerInvocation\n";
     return 1;