From a1857172a19ec476e49c61df50d536553b0a7c91 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Wed, 17 Aug 2016 20:55:35 +0000 Subject: Revert "[Tooling] Parse compilation database command lines on Windows." This reverts commit 27a874790fc79f6391ad3703d7c790f51ac6ae1f. After the introduction of windows command line parsing, some unit tests began failing that expect to test gnu style command line quirks. The fix is mechanical but time consuming, so revert this for now. llvm-svn: 278976 --- clang/lib/Tooling/JSONCompilationDatabase.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'clang/lib/Tooling/JSONCompilationDatabase.cpp') diff --git a/clang/lib/Tooling/JSONCompilationDatabase.cpp b/clang/lib/Tooling/JSONCompilationDatabase.cpp index 5f192f7..299fbdc 100644 --- a/clang/lib/Tooling/JSONCompilationDatabase.cpp +++ b/clang/lib/Tooling/JSONCompilationDatabase.cpp @@ -16,10 +16,7 @@ #include "clang/Tooling/CompilationDatabasePluginRegistry.h" #include "clang/Tooling/Tooling.h" #include "llvm/ADT/SmallString.h" -#include "llvm/Support/Allocator.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Support/Path.h" -#include "llvm/Support/StringSaver.h" #include namespace clang { @@ -116,21 +113,6 @@ class CommandLineArgumentParser { std::vector unescapeCommandLine( StringRef EscapedCommandLine) { - llvm::Triple Triple(llvm::sys::getProcessTriple()); - if (Triple.getOS() == llvm::Triple::OSType::Win32) { - // Assume Windows command line parsing on Win32 unless the triple explicitly - // tells us otherwise. - if (!Triple.hasEnvironment() || - Triple.getEnvironment() == llvm::Triple::EnvironmentType::MSVC) { - llvm::BumpPtrAllocator Alloc; - llvm::StringSaver Saver(Alloc); - llvm::SmallVector T; - llvm::cl::TokenizeWindowsCommandLine(EscapedCommandLine, Saver, T); - std::vector Result(T.begin(), T.end()); - return Result; - } - } - CommandLineArgumentParser parser(EscapedCommandLine); return parser.parse(); } -- cgit v1.1