summaryrefslogtreecommitdiffstats
path: root/clang/lib/Tooling/JSONCompilationDatabase.cpp
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2016-08-17 20:55:35 +0000
committerZachary Turner <zturner@google.com>2016-08-17 20:55:35 +0000
commita1857172a19ec476e49c61df50d536553b0a7c91 (patch)
treead10fa424002f1160c49bdedafaef6f3207533bf /clang/lib/Tooling/JSONCompilationDatabase.cpp
parenta9a548049a29fb73b95bfdeea1a606b42a8d5c85 (diff)
downloadbcm5719-llvm-a1857172a19ec476e49c61df50d536553b0a7c91.tar.gz
bcm5719-llvm-a1857172a19ec476e49c61df50d536553b0a7c91.zip
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
Diffstat (limited to 'clang/lib/Tooling/JSONCompilationDatabase.cpp')
-rw-r--r--clang/lib/Tooling/JSONCompilationDatabase.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/clang/lib/Tooling/JSONCompilationDatabase.cpp b/clang/lib/Tooling/JSONCompilationDatabase.cpp
index 5f192f793a4..299fbdc149b 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 <system_error>
namespace clang {
@@ -116,21 +113,6 @@ class CommandLineArgumentParser {
std::vector<std::string> 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<const char *, 64> T;
- llvm::cl::TokenizeWindowsCommandLine(EscapedCommandLine, Saver, T);
- std::vector<std::string> Result(T.begin(), T.end());
- return Result;
- }
- }
-
CommandLineArgumentParser parser(EscapedCommandLine);
return parser.parse();
}
OpenPOWER on IntegriCloud