From 0f12f9096e1e33d88cb0b5601b0e035a2674c19a Mon Sep 17 00:00:00 2001 From: Kadir Cetinkaya Date: Wed, 4 Dec 2019 15:50:27 +0100 Subject: Revert "[llvm][Support] Take in CurrentDirectory as a parameter in ExpandResponseFiles" This reverts commit 75656005dbc8866e1888932a68a830b0df403560. --- clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp') diff --git a/clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp b/clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp index 84936ba05b2..bb519277dfa 100644 --- a/clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp +++ b/clang/lib/Tooling/ExpandResponseFilesCompilationDatabase.cpp @@ -7,7 +7,6 @@ //===----------------------------------------------------------------------===// #include "clang/Tooling/CompilationDatabase.h" -#include "llvm/ADT/StringRef.h" #include "llvm/ADT/Triple.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/ConvertUTF.h" @@ -48,6 +47,12 @@ public: private: std::vector expand(std::vector Cmds) const { for (auto &Cmd : Cmds) { + // FIXME: we should rather propagate the current directory into + // ExpandResponseFiles as well in addition to FS. + if (std::error_code EC = FS->setCurrentWorkingDirectory(Cmd.Directory)) { + llvm::consumeError(llvm::errorCodeToError(EC)); + continue; + } bool SeenRSPFile = false; llvm::SmallVector Argv; Argv.reserve(Cmd.CommandLine.size()); @@ -59,8 +64,7 @@ private: continue; llvm::BumpPtrAllocator Alloc; llvm::StringSaver Saver(Alloc); - llvm::cl::ExpandResponseFiles(Saver, Tokenizer, Argv, false, false, *FS, - llvm::StringRef(Cmd.Directory)); + llvm::cl::ExpandResponseFiles(Saver, Tokenizer, Argv, false, false, *FS); Cmd.CommandLine.assign(Argv.begin(), Argv.end()); } return Cmds; -- cgit v1.2.3