Index: llvm/trunk/tools/llvm-demangle-fuzzer/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-demangle-fuzzer/CMakeLists.txt
+++ llvm/trunk/tools/llvm-demangle-fuzzer/CMakeLists.txt
@@ -1,10 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Demangle
-  FuzzMutate
-  Support
-)
-
-add_llvm_fuzzer(llvm-demangle-fuzzer
-  llvm-demangle-fuzzer.cpp
-  DUMMY_MAIN DummyDemanglerFuzzer.cpp
-  )
Index: llvm/trunk/tools/llvm-demangle-fuzzer/DummyDemanglerFuzzer.cpp
===================================================================
--- llvm/trunk/tools/llvm-demangle-fuzzer/DummyDemanglerFuzzer.cpp
+++ llvm/trunk/tools/llvm-demangle-fuzzer/DummyDemanglerFuzzer.cpp
@@ -1,19 +0,0 @@
-//===--- DummyDemanglerMain.cpp - Entry point to sanity check the fuzzer --===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// Implementation of main so we can build and test without linking libFuzzer.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/FuzzMutate/FuzzerCLI.h"
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size);
-int main(int argc, char *argv[]) {
-  return llvm::runFuzzerOnInputs(argc, argv, LLVMFuzzerTestOneInput);
-}
Index: llvm/trunk/tools/llvm-demangle-fuzzer/llvm-demangle-fuzzer.cpp
===================================================================
--- llvm/trunk/tools/llvm-demangle-fuzzer/llvm-demangle-fuzzer.cpp
+++ llvm/trunk/tools/llvm-demangle-fuzzer/llvm-demangle-fuzzer.cpp
@@ -1,24 +0,0 @@
-//===--- llvm-demangle-fuzzer.cpp - Fuzzer for the Itanium Demangler ------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Demangle/Demangle.h"
-
-#include <cstdint>
-#include <cstdlib>
-#include <string>
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
-  std::string NullTerminatedString((const char *)Data, Size);
-  int status = 0;
-  if (char *demangle = llvm::itaniumDemangle(NullTerminatedString.c_str(), nullptr,
-                                         nullptr, &status))
-    free(demangle);
-
-  return 0;
-}
Index: llvm/trunk/tools/llvm-itanium-demangle-fuzzer/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-itanium-demangle-fuzzer/CMakeLists.txt
+++ llvm/trunk/tools/llvm-itanium-demangle-fuzzer/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(LLVM_LINK_COMPONENTS
+  Demangle
+  FuzzMutate
+  Support
+)
+
+add_llvm_fuzzer(llvm-itanium-demangle-fuzzer
+  llvm-itanium-demangle-fuzzer.cpp
+  DUMMY_MAIN DummyDemanglerFuzzer.cpp
+  )
Index: llvm/trunk/tools/llvm-itanium-demangle-fuzzer/DummyDemanglerFuzzer.cpp
===================================================================
--- llvm/trunk/tools/llvm-itanium-demangle-fuzzer/DummyDemanglerFuzzer.cpp
+++ llvm/trunk/tools/llvm-itanium-demangle-fuzzer/DummyDemanglerFuzzer.cpp
@@ -0,0 +1,19 @@
+//===--- DummyDemanglerMain.cpp - Entry point to sanity check the fuzzer --===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Implementation of main so we can build and test without linking libFuzzer.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/FuzzMutate/FuzzerCLI.h"
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size);
+int main(int argc, char *argv[]) {
+  return llvm::runFuzzerOnInputs(argc, argv, LLVMFuzzerTestOneInput);
+}
Index: llvm/trunk/tools/llvm-itanium-demangle-fuzzer/llvm-itanium-demangle-fuzzer.cpp
===================================================================
--- llvm/trunk/tools/llvm-itanium-demangle-fuzzer/llvm-itanium-demangle-fuzzer.cpp
+++ llvm/trunk/tools/llvm-itanium-demangle-fuzzer/llvm-itanium-demangle-fuzzer.cpp
@@ -0,0 +1,24 @@
+//===--- llvm-demangle-fuzzer.cpp - Fuzzer for the Itanium Demangler ------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Demangle/Demangle.h"
+
+#include <cstdint>
+#include <cstdlib>
+#include <string>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+  std::string NullTerminatedString((const char *)Data, Size);
+  int status = 0;
+  if (char *demangle = llvm::itaniumDemangle(NullTerminatedString.c_str(), nullptr,
+                                         nullptr, &status))
+    free(demangle);
+
+  return 0;
+}
Index: llvm/trunk/tools/llvm-microsoft-demangle-fuzzer/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-microsoft-demangle-fuzzer/CMakeLists.txt
+++ llvm/trunk/tools/llvm-microsoft-demangle-fuzzer/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(LLVM_LINK_COMPONENTS
+  Demangle
+  FuzzMutate
+  Support
+)
+
+add_llvm_fuzzer(llvm-microsoft-demangle-fuzzer
+  llvm-microsoft-demangle-fuzzer.cpp
+  DUMMY_MAIN DummyDemanglerFuzzer.cpp
+  )
Index: llvm/trunk/tools/llvm-microsoft-demangle-fuzzer/DummyDemanglerFuzzer.cpp
===================================================================
--- llvm/trunk/tools/llvm-microsoft-demangle-fuzzer/DummyDemanglerFuzzer.cpp
+++ llvm/trunk/tools/llvm-microsoft-demangle-fuzzer/DummyDemanglerFuzzer.cpp
@@ -0,0 +1,19 @@
+//===--- DummyDemanglerMain.cpp - Entry point to sanity check the fuzzer --===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Implementation of main so we can build and test without linking libFuzzer.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/FuzzMutate/FuzzerCLI.h"
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size);
+int main(int argc, char *argv[]) {
+  return llvm::runFuzzerOnInputs(argc, argv, LLVMFuzzerTestOneInput);
+}
Index: llvm/trunk/tools/llvm-microsoft-demangle-fuzzer/llvm-microsoft-demangle-fuzzer.cpp
===================================================================
--- llvm/trunk/tools/llvm-microsoft-demangle-fuzzer/llvm-microsoft-demangle-fuzzer.cpp
+++ llvm/trunk/tools/llvm-microsoft-demangle-fuzzer/llvm-microsoft-demangle-fuzzer.cpp
@@ -0,0 +1,21 @@
+//===--- llvm-demangle-fuzzer.cpp - Fuzzer for the Itanium Demangler ------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Demangle/Demangle.h"
+
+#include <cstdint>
+#include <cstdlib>
+#include <string>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+  std::string NullTerminatedString((const char *)Data, Size);
+  free(llvm::microsoftDemangle(NullTerminatedString.c_str(), nullptr, nullptr,
+                               nullptr));
+  return 0;
+}