Fix link option

Author: redsun82

patches/swift/04-allow-plugging-in-observer.patch

@@ -212,3 +212,217 @@ index a5dc3ccb845..30667ae51f9 100644
                             DESTINATION "bin"
                             COMPONENT editor-integration)
 -
+diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
+index 6d93e52f1d5..9ab79aeb9d6 100644
+--- a/cmake/modules/AddSwift.cmake
++++ b/cmake/modules/AddSwift.cmake
+@@ -715,6 +715,7 @@ function(add_swift_host_tool executable)
+ 
+         # Include the abi stable system stdlib in our rpath.
+         list(APPEND RPATH_LIST "/usr/lib/swift")
++        list(APPEND RPATH_LIST "${SWIFTLIB_DIR}")
+ 
+       elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE-WITH-HOSTLIBS")
+ 
+@@ -731,6 +732,7 @@ function(add_swift_host_tool executable)
+ 
+         # Include the abi stable system stdlib in our rpath.
+         list(APPEND RPATH_LIST "/usr/lib/swift")
++        list(APPEND RPATH_LIST "@executable_path/../lib")
+ 
+       elseif(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING-WITH-HOSTLIBS")
+         # Add the SDK directory for the host platform.
+@@ -798,7 +800,7 @@ function(add_swift_host_tool executable)
+       if(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
+         set_target_properties(${executable} PROPERTIES
+           BUILD_WITH_INSTALL_RPATH YES
+-          INSTALL_RPATH  "${host_lib_dir}")
++          INSTALL_RPATH  "${host_lib_dir};$ORIGIN/../lib")
+       else()
+         set_target_properties(${executable} PROPERTIES
+           BUILD_WITH_INSTALL_RPATH YES
+diff --git a/include/swift/DriverTool/FrontendObserver.h b/include/swift/DriverTool/FrontendObserver.h
+new file mode 100644
+index 00000000000..4ac9b299a13
+--- /dev/null
++++ b/include/swift/DriverTool/FrontendObserver.h
+@@ -0,0 +1,10 @@
++#pragma once
++
++#include "llvm/ADT/ArrayRef.h"
++#include "swift/FrontendTool/FrontendTool.h"
++
++namespace swift {
++
++FrontendObserver* getFrontendObserver(llvm::ArrayRef<const char*> argv);
++
++} // namespace swift
+diff --git a/include/swift/FrontendTool/FrontendTool.h b/include/swift/FrontendTool/FrontendTool.h
+index 184e6196918..ef5c3eafe69 100644
+--- a/include/swift/FrontendTool/FrontendTool.h
++++ b/include/swift/FrontendTool/FrontendTool.h
+@@ -53,6 +53,9 @@ public:
+   /// The frontend has executed the SIL optimization and diagnostics pipelines.
+   virtual void performedSILProcessing(SILModule &module);
+ 
++  /// The frontend has finished executing with the given return value
++  virtual void finished(int status);
++
+   // TODO: maybe enhance this interface to hear about IRGen and LLVM
+   // progress.
+ };
+diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
+index ec3fa2c853b..c4afddc4940 100644
+--- a/lib/AST/CMakeLists.txt
++++ b/lib/AST/CMakeLists.txt
+@@ -58,7 +58,6 @@ add_swift_host_library(swiftAST STATIC
+   GenericParamList.cpp
+   GenericSignature.cpp
+   GenericSignatureBuilder.cpp
+-  Identifier.cpp
+   ImportCache.cpp
+   IndexSubset.cpp
+   InlinableText.cpp
+@@ -122,6 +121,14 @@ add_swift_host_library(swiftAST STATIC
+   ${SWIFTAST_LLVM_LINK_COMPONENTS}
+   )
+ 
++add_swift_host_library(swiftIdentifier SHARED
++        Identifier.cpp
++        )
++
++if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)
++  target_link_options(swiftIdentifier PRIVATE "-undefined dynamic_lookup")
++endif()
++
+ if(SWIFT_FORCE_OPTIMIZED_TYPECHECKER)
+   if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)
+     target_compile_options(swiftAST PRIVATE /O2 /Ob2)
+@@ -152,7 +159,7 @@ if(NOT SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
+ endif()
+ 
+ target_link_libraries(swiftAST
+-  PUBLIC swiftBasic
++  PUBLIC swiftBasic swiftIdentifier
+   PRIVATE swiftSyntax)
+ if(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
+   # Remove dependencies from clangBasic to avoid bringing along some llvm
+diff --git a/lib/DriverTool/CMakeLists.txt b/lib/DriverTool/CMakeLists.txt
+index 869c00fece9..21610d8eb95 100644
+--- a/lib/DriverTool/CMakeLists.txt
++++ b/lib/DriverTool/CMakeLists.txt
+@@ -14,16 +14,24 @@ set(driver_common_libs
+                 swiftSymbolGraphGen
+                 LLVMBitstreamReader)
+ 
++add_swift_host_library(swiftFrontendObserver SHARED
++   swift_frontend_observer.cpp)
++target_link_libraries(swiftFrontendObserver
++        PUBLIC
++        swiftFrontendTool)
++
+ add_swift_host_library(swiftDriverTool STATIC
+   ${driver_sources_and_options}
+ )
+ target_link_libraries(swiftDriverTool
+                       PUBLIC
+-                      ${driver_common_libs})
++                      ${driver_common_libs}
++		              swiftFrontendObserver)
+ 
+ # If building as part of clang, make sure the headers are installed.
+ if(NOT SWIFT_BUILT_STANDALONE)
+   add_dependencies(swiftDriverTool clang-resource-headers)
+ endif()
+ 
++set_swift_llvm_is_available(swiftFrontendObserver)
+ set_swift_llvm_is_available(swiftDriverTool)
+diff --git a/lib/DriverTool/driver.cpp b/lib/DriverTool/driver.cpp
+index f71e2de9eae..a500e30827f 100644
+--- a/lib/DriverTool/driver.cpp
++++ b/lib/DriverTool/driver.cpp
+@@ -31,6 +31,7 @@
+ #include "swift/Frontend/PrintingDiagnosticConsumer.h"
+ #include "swift/FrontendTool/FrontendTool.h"
+ #include "swift/DriverTool/DriverTool.h"
++#include "swift/DriverTool/FrontendObserver.h"
+ #include "llvm/ADT/SmallVector.h"
+ #include "llvm/Support/CommandLine.h"
+ #include "llvm/Support/ConvertUTF.h"
+@@ -197,7 +198,8 @@ static int run_driver(StringRef ExecName,
+     if (FirstArg == "-frontend") {
+       return performFrontend(llvm::makeArrayRef(argv.data()+2,
+                                                 argv.data()+argv.size()),
+-                             argv[0], (void *)(intptr_t)getExecutablePath);
++                             argv[0], (void *)(intptr_t)getExecutablePath,
++                             getFrontendObserver(argv));
+     }
+     if (FirstArg == "-modulewrap") {
+       return modulewrap_main(llvm::makeArrayRef(argv.data()+2,
+@@ -211,7 +213,8 @@ static int run_driver(StringRef ExecName,
+         && ExecName == "swift-frontend") {
+       return performFrontend(llvm::makeArrayRef(argv.data()+1,
+                                                 argv.data()+argv.size()),
+-                             argv[0], (void *)(intptr_t)getExecutablePath);
++                             argv[0], (void *)(intptr_t)getExecutablePath,
++                             getFrontendObserver(argv));
+     }
+ 
+     if (FirstArg == "repl") {
+diff --git a/lib/DriverTool/swift_frontend_observer.cpp b/lib/DriverTool/swift_frontend_observer.cpp
+new file mode 100644
+index 00000000000..e16b2f970cd
+--- /dev/null
++++ b/lib/DriverTool/swift_frontend_observer.cpp
+@@ -0,0 +1,9 @@
++#include "swift/DriverTool/FrontendObserver.h"
++
++namespace swift {
++
++FrontendObserver* getFrontendObserver(llvm::ArrayRef<const char*>) {
++  return nullptr;
++}
++
++} // namespace swift
+diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
+index 811fb912f8a..afa2034aa71 100644
+--- a/lib/FrontendTool/FrontendTool.cpp
++++ b/lib/FrontendTool/FrontendTool.cpp
+@@ -1924,7 +1924,7 @@ public:
+   };
+ };
+ 
+-int swift::performFrontend(ArrayRef<const char *> Args,
++static int performFrontendImpl(ArrayRef<const char *> Args,
+                            const char *Argv0, void *MainAddr,
+                            FrontendObserver *observer) {
+   INITIALIZE_LLVM();
+@@ -2263,8 +2263,19 @@ int swift::performFrontend(ArrayRef<const char *> Args,
+   return r;
+ }
+ 
++int swift::performFrontend(ArrayRef<const char *> Args,
++                           const char *Argv0, void *MainAddr,
++                           FrontendObserver *observer) {
++  auto ret = performFrontendImpl(Args, Argv0, MainAddr, observer);
++  if (observer) {
++    observer->finished(ret);
++  }
++  return ret;
++}
++
+ void FrontendObserver::parsedArgs(CompilerInvocation &invocation) {}
+ void FrontendObserver::configuredCompiler(CompilerInstance &instance) {}
+ void FrontendObserver::performedSemanticAnalysis(CompilerInstance &instance) {}
+ void FrontendObserver::performedSILGeneration(SILModule &module) {}
+ void FrontendObserver::performedSILProcessing(SILModule &module) {}
++void FrontendObserver::finished(int status) {}
+diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
+index a5dc3ccb845..30667ae51f9 100644
+--- a/tools/driver/CMakeLists.txt
++++ b/tools/driver/CMakeLists.txt
+@@ -123,4 +123,3 @@ add_dependencies(editor-integration swift-frontend)
+ swift_install_in_component(FILES "${SWIFT_RUNTIME_OUTPUT_INTDIR}/swift-indent${CMAKE_EXECUTABLE_SUFFIX}"
+                            DESTINATION "bin"
+                            COMPONENT editor-integration)
+-