Mangling: Let the demangler handle the new mangling scheme

Author: eeckstein

lib/Basic/Demangle.cpp

@@ -16,6 +16,10 @@
 
 #include "swift/Basic/Demangle.h"
 #include "swift/Basic/Fallthrough.h"
+#ifndef NO_NEW_DEMANGLING
+#include "swift/Basic/Demangler.h"
+#include "swift/Basic/ManglingMacros.h"
+#endif
 #include "swift/Strings.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/Punycode.h"

stdlib/public/Reflection/Demangle.cpp

@@ -10,6 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define NO_NEW_DEMANGLING
+
 #include "../../../lib/Basic/Demangle.cpp"
+#include "../../../lib/Basic/ManglingUtils.cpp"
 #include "../../../lib/Basic/Punycode.cpp"
 #include "../../../lib/Basic/PunycodeUTF8.cpp"

stdlib/public/runtime/Demangle.cpp

@@ -10,7 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define NO_NEW_DEMANGLING
+
 #include "../../../lib/Basic/Demangle.cpp"
+#include "../../../lib/Basic/ManglingUtils.cpp"
 #include "../../../lib/Basic/Punycode.cpp"
 #include "swift/Runtime/Metadata.h"
 #include "Private.h"

tools/swift-demangle/swift-demangle.cpp

@@ -15,6 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/Basic/DemangleWrappers.h"
+#include "swift/Basic/ManglingMacros.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/MemoryBuffer.h"
@@ -104,7 +105,7 @@ static void demangle(llvm::raw_ostream &os, llvm::StringRef name,
 
 static int demangleSTDIN(const swift::Demangle::DemangleOptions &options) {
   // This doesn't handle Unicode symbols, but maybe that's okay.
-  llvm::Regex maybeSymbol("_T[_a-zA-Z0-9$]+");
+  llvm::Regex maybeSymbol("(_T|" MANGLING_PREFIX_STR ")[_a-zA-Z0-9$]+");
 
   while (true) {
     char *inputLine = NULL;