Merge pull request #6821 from hughbe/demangle-windows

Port swift-demangle to Windows

Author: slavapestov

tools/swift-demangle/swift-demangle.cpp

@@ -14,10 +14,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if defined(__FreeBSD__)
-#define _WITH_GETLINE
-#endif
-
 #include "swift/Basic/DemangleWrappers.h"
 #include "swift/Basic/ManglingMacros.h"
 #include "llvm/ADT/SmallString.h"
@@ -28,14 +24,14 @@
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/raw_ostream.h"
 
+// For std::rand, to work around a bug if main()'s first function call passes
+// argv[0].
+#if defined(__CYGWIN__)
 #include <cstdlib>
-#include <string>
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
-#include <unistd.h>
-#else
-#include <io.h>
 #endif
 
+#include <iostream>
+
 static llvm::cl::opt<bool>
 ExpandMode("expand",
                llvm::cl::desc("Expand mode (show node structure of the demangling)"));
@@ -119,27 +115,17 @@ static int demangleSTDIN(const swift::Demangle::DemangleOptions &options) {
   // This doesn't handle Unicode symbols, but maybe that's okay.
   llvm::Regex maybeSymbol("(_T|" MANGLING_PREFIX_STR ")[_a-zA-Z0-9$]+");
 
-  while (true) {
-    char *inputLine = nullptr;
-    size_t size;
-    if (getline(&inputLine, &size, stdin) == -1 || size <= 0) {
-      if (errno == 0) {
-        break;
-      }
-
-      return EXIT_FAILURE;
-    }
+  for (std::string mangled; std::getline(std::cin, mangled);) {
+    llvm::StringRef inputContents(mangled);
 
-    llvm::StringRef inputContents(inputLine);
     llvm::SmallVector<llvm::StringRef, 1> matches;
     while (maybeSymbol.match(inputContents, &matches)) {
       llvm::outs() << substrBefore(inputContents, matches.front());
       demangle(llvm::outs(), matches.front(), options);
       inputContents = substrAfter(inputContents, matches.front());
     }
 
-    llvm::outs() << inputContents;
-    free(inputLine);
+    llvm::outs() << inputContents << '\n';
   }
 
   return EXIT_SUCCESS;