Merge pull request #12705 from compnerd/SwiftDemangle

SwiftDemangle: build on non-Darwin targets

Author: compnerd

cmake/modules/AddSwift.cmake

@@ -719,7 +719,8 @@ function(_add_swift_library_single target name)
   # On platforms that use ELF binaries we add markers for metadata sections in
   # the shared libraries using these object files.  This wouldn't be necessary
   # if the link was done by the swift binary: rdar://problem/19007002
-  if("${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
+  if(SWIFTLIB_TARGET_LIBRARY AND
+     "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
     if("${libkind}" STREQUAL "SHARED")
       set(arch_subdir "${SWIFTLIB_DIR}/${SWIFTLIB_SINGLE_SUBDIR}")
 

lib/CMakeLists.txt

@@ -32,9 +32,7 @@ add_subdirectory(PrintAsObjC)
 add_subdirectory(RemoteAST)
 add_subdirectory(Sema)
 add_subdirectory(Serialization)
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  add_subdirectory(SwiftDemangle)
-endif()
+add_subdirectory(SwiftDemangle)
 add_subdirectory(SIL)
 add_subdirectory(SILGen)
 add_subdirectory(SILOptimizer)

lib/SwiftDemangle/CMakeLists.txt

@@ -2,6 +2,9 @@ add_swift_library(swiftDemangle SHARED
   SwiftDemangle.cpp
   MangleHack.cpp
   LINK_LIBRARIES swiftDemangling)
+if(NOT APPLE)
+  target_link_libraries(swiftDemangle PRIVATE bsd)
+endif()
 
 swift_install_in_component(compiler
     TARGETS swiftDemangle

lib/SwiftDemangle/MangleHack.cpp

@@ -17,11 +17,39 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/Strings.h"
 #include "swift/SwiftDemangle/MangleHack.h"
+#include "swift/Strings.h"
 #include <cassert>
-#include <cstring>
+#include <cstdarg>
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+#if defined(_WIN32)
+static int vasprintf(char **strp, const char *fmt, va_list ap) {
+  int len = _vscprintf(fmt, ap);
+  if (len < 0)
+    return len;
+  char *buffer = static_cast<char *>(malloc(len + 1));
+  if (buffer == nullptr)
+    return -1;
+  int result = vsprintf(buffer, fmt, ap);
+  if (result < 0) {
+    free(buffer);
+    return -1;
+  }
+  *strp = buffer;
+  return result;
+}
+
+static int asprintf(char **strp, const char *fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+  int result = vasprintf(strp, fmt, args);
+  va_end(args);
+  return result;
+}
+#endif
 
 const char *
 _swift_mangleSimpleClass(const char *module, const char *class_) {

lib/SwiftDemangle/SwiftDemangle.cpp

@@ -17,6 +17,9 @@
 
 #include "swift/Demangling/Demangle.h"
 #include "swift/SwiftDemangle/SwiftDemangle.h"
+#if defined(__linux__) || defined(_WIN32)
+#include <bsd/string.h>
+#endif
 
 static size_t swift_demangle_getDemangledName_Options(const char *MangledName,
     char *OutputBuffer, size_t Length,