maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Zachary Turner 2016-08-17 20:55:35 +00:00
parent a9a548049a
commit a1857172a1
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang/lib/Tooling/JSONCompilationDatabase.cpp
View File

@ -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();
}