Merge pull request #8013 from eeckstein/demangler-cmake

libraries: instead of including all demangler sources into a single C++ source file,

Author: eeckstein

stdlib/public/Reflection/CMakeLists.txt

@@ -1,10 +1,15 @@
 add_swift_library(swiftReflection STATIC TARGET_LIBRARY FORCE_BUILD_FOR_HOST_SDK
-  Demangle.cpp
   MetadataSource.cpp
-  Remangle.cpp
   TypeLowering.cpp
   TypeRef.cpp
   TypeRefBuilder.cpp
+  "${SWIFT_SOURCE_DIR}/lib/Demangling/Context.cpp"
+  "${SWIFT_SOURCE_DIR}/lib/Demangling/OldDemangler.cpp"
+  "${SWIFT_SOURCE_DIR}/lib/Demangling/Demangler.cpp"
+  "${SWIFT_SOURCE_DIR}/lib/Demangling/NodePrinter.cpp"
+  "${SWIFT_SOURCE_DIR}/lib/Demangling/ManglingUtils.cpp"
+  "${SWIFT_SOURCE_DIR}/lib/Demangling/Punycode.cpp"
+  "${SWIFT_SOURCE_DIR}/lib/Demangling/Remangler.cpp"
 
   C_COMPILE_FLAGS ${SWIFT_RUNTIME_CXX_FLAGS}
   LINK_FLAGS ${SWIFT_RUNTIME_LINK_FLAGS}

stdlib/public/Reflection/Demangle.cpp

@@ -32,8 +32,8 @@ set(swift_runtime_objc_sources
     ErrorObject.mm
     SwiftObject.mm
     SwiftValue.mm
-    Remangle.cpp
-    Reflection.mm)
+    Reflection.mm
+    "${SWIFT_SOURCE_DIR}/lib/Demangling/Remangler.cpp")
 
 set(swift_runtime_sources
     AnyHashableSupport.cpp
@@ -59,11 +59,16 @@ set(swift_runtime_sources
     Portability.cpp
     ProtocolConformance.cpp
     RefCount.cpp
-    RuntimeEntrySymbols.cpp)
+    RuntimeEntrySymbols.cpp
+    "${SWIFT_SOURCE_DIR}/lib/Demangling/OldDemangler.cpp"
+    "${SWIFT_SOURCE_DIR}/lib/Demangling/Demangler.cpp"
+    "${SWIFT_SOURCE_DIR}/lib/Demangling/NodePrinter.cpp"
+    "${SWIFT_SOURCE_DIR}/lib/Demangling/Context.cpp"
+    "${SWIFT_SOURCE_DIR}/lib/Demangling/ManglingUtils.cpp"
+    "${SWIFT_SOURCE_DIR}/lib/Demangling/Punycode.cpp")
 
 # Acknowledge that the following sources are known.
 set(LLVM_OPTIONAL_SOURCES
-    Remangle.cpp
     swift_sections.S
     MutexPThread.cpp
     MutexWin32.cpp

stdlib/public/Reflection/Remangle.cpp

@@ -10,19 +10,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "../../../lib/Demangling/OldDemangler.cpp"
-#include "../../../lib/Demangling/Demangler.cpp"
-#include "../../../lib/Demangling/NodePrinter.cpp"
-#include "../../../lib/Demangling/Context.cpp"
-#include "../../../lib/Demangling/ManglingUtils.cpp"
-#include "../../../lib/Demangling/Punycode.cpp"
 #include "swift/Runtime/Metadata.h"
+#include "swift/Strings.h"
 #include "Private.h"
 
+#include <vector>
+
 #if SWIFT_OBJC_INTEROP
 #include <objc/runtime.h>
 #endif
 
+using namespace swift;
+
 // FIXME: This stuff should be merged with the existing logic in
 // include/swift/Reflection/TypeRefBuilder.h as part of the rewrite
 // to change stdlib reflection over to using remote mirrors.

stdlib/public/runtime/CMakeLists.txt

@@ -17,7 +17,7 @@
 #ifndef SWIFT_RUNTIME_PRIVATE_H
 #define SWIFT_RUNTIME_PRIVATE_H
 
-#include "swift/Demangling/Demangle.h"
+#include "swift/Demangling/Demangler.h"
 #include "swift/Runtime/Config.h"
 #include "swift/Runtime/Metadata.h"
 #include "llvm/Support/Compiler.h"