sepavloff created this revision.
sepavloff added reviewers: MaskRay, mgorny.
Herald added subscribers: StephenFan, hiraditya.
Herald added a project: All.
sepavloff requested review of this revision.
Herald added projects: clang, LLVM.
Herald added a subscriber: llvm-commits.
Class ExpansionContext encapsulates options for search and expansion of
response files, including configuration files. With this change the
directories which are searched for configuration files are also stored
in ExpansionContext.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D135439
Files:
clang/include/clang/Driver/Driver.h
clang/lib/Driver/Driver.cpp
llvm/include/llvm/Support/CommandLine.h
llvm/lib/Support/CommandLine.cpp
Index: llvm/lib/Support/CommandLine.cpp
===================================================================
--- llvm/lib/Support/CommandLine.cpp
+++ llvm/lib/Support/CommandLine.cpp
@@ -1350,6 +1350,43 @@
ExpansionContext::ExpansionContext(BumpPtrAllocator &A, TokenizerCallback T)
: Saver(A), Tokenizer(T), FS(vfs::getRealFileSystem().get()) {}
+bool ExpansionContext::findConfigFile(StringRef FileName,
+ std::string &FilePath) {
+ SmallString<128> CfgFilePath;
+ const auto FileExists = [this](SmallString<128> Path) -> bool {
+ auto Status = FS->status(Path);
+ return Status &&
+ Status->getType() == llvm::sys::fs::file_type::regular_file;
+ };
+
+ // If file name contains directory separator, treat it as a path to
+ // configuration file.
+ if (llvm::sys::path::has_parent_path(FileName)) {
+ CfgFilePath = FileName;
+ if (llvm::sys::path::is_relative(FileName) && FS->makeAbsolute(CfgFilePath))
+ return false;
+ if (!FileExists(CfgFilePath))
+ return false;
+ FilePath = CfgFilePath.str();
+ return true;
+ }
+
+ // Look for the file in search directories.
+ for (const StringRef &Dir : SearchDirs) {
+ if (Dir.empty())
+ continue;
+ CfgFilePath.assign(Dir);
+ llvm::sys::path::append(CfgFilePath, FileName);
+ llvm::sys::path::native(CfgFilePath);
+ if (FileExists(CfgFilePath)) {
+ FilePath = CfgFilePath.str();
+ return true;
+ }
+ }
+
+ return false;
+}
+
bool ExpansionContext::readConfigFile(StringRef CfgFile,
SmallVectorImpl<const char *> &Argv) {
SmallString<128> AbsPath;
Index: llvm/include/llvm/Support/CommandLine.h
===================================================================
--- llvm/include/llvm/Support/CommandLine.h
+++ llvm/include/llvm/Support/CommandLine.h
@@ -2081,6 +2081,9 @@
/// current directory is used instead.
StringRef CurrentDir;
+ /// Directories used for search of config files.
+ ArrayRef<StringRef> SearchDirs;
+
/// True if names of nested response files must be resolved relative to
/// including file.
bool RelativeNames = false;
@@ -2113,11 +2116,27 @@
return *this;
}
+ ExpansionContext &setSearchDirs(ArrayRef<StringRef> X) {
+ SearchDirs = X;
+ return *this;
+ }
+
ExpansionContext &setVFS(vfs::FileSystem *X) {
FS = X;
return *this;
}
+ /// Looks for the specified configuration file.
+ ///
+ /// \param[in] FileName Name of the file to search for.
+ /// \param[out] FilePath File absolute path, if it was found.
+ /// \return True if file was found.
+ ///
+ /// If the specified file name contains a directory separator, it is searched
+ /// for by its absolute path. Otherwise looks for file sequentially in
+ /// directories specified by SearchDirs field.
+ bool findConfigFile(StringRef FileName, std::string &FilePath);
+
/// Reads command line options from the given configuration file.
///
/// \param [in] CfgFile Path to configuration file.
Index: clang/lib/Driver/Driver.cpp
===================================================================
--- clang/lib/Driver/Driver.cpp
+++ clang/lib/Driver/Driver.cpp
@@ -909,35 +909,6 @@
//
}
-/// Looks the given directories for the specified file.
-///
-/// \param[out] FilePath File path, if the file was found.
-/// \param[in] Dirs Directories used for the search.
-/// \param[in] FileName Name of the file to search for.
-/// \return True if file was found.
-///
-/// Looks for file specified by FileName sequentially in directories specified
-/// by Dirs.
-///
-static bool searchForFile(SmallVectorImpl<char> &FilePath,
- ArrayRef<StringRef> Dirs, StringRef FileName,
- llvm::vfs::FileSystem &FS) {
- SmallString<128> WPath;
- for (const StringRef &Dir : Dirs) {
- if (Dir.empty())
- continue;
- WPath.clear();
- llvm::sys::path::append(WPath, Dir, FileName);
- llvm::sys::path::native(WPath);
- auto Status = FS.status(WPath);
- if (Status && Status->getType() == llvm::sys::fs::file_type::regular_file) {
- FilePath = std::move(WPath);
- return true;
- }
- }
- return false;
-}
-
static void appendOneArg(InputArgList &Args, const Arg *Opt,
const Arg *BaseArg) {
// The args for config files or /clang: flags belong to different InputArgList
@@ -954,11 +925,10 @@
Args.append(Copy);
}
-bool Driver::readConfigFile(StringRef FileName) {
+bool Driver::readConfigFile(StringRef FileName,
+ llvm::cl::ExpansionContext &ExpCtx) {
// Try reading the given file.
SmallVector<const char *, 32> NewCfgArgs;
- llvm::cl::ExpansionContext ExpCtx(Alloc, llvm::cl::tokenizeConfigFile);
- ExpCtx.setVFS(&getVFS());
if (!ExpCtx.readConfigFile(FileName, NewCfgArgs)) {
Diag(diag::err_drv_cannot_read_config_file) << FileName;
return true;
@@ -999,6 +969,10 @@
}
bool Driver::loadConfigFiles() {
+ llvm::cl::ExpansionContext ExpCtx(Saver.getAllocator(),
+ llvm::cl::tokenizeConfigFile);
+ ExpCtx.setVFS(&getVFS());
+
// Process options that change search path for config files.
if (CLOptions) {
if (CLOptions->hasArg(options::OPT_config_system_dir_EQ)) {
@@ -1023,31 +997,32 @@
// Prepare list of directories where config file is searched for.
StringRef CfgFileSearchDirs[] = {UserConfigDir, SystemConfigDir, Dir};
+ ExpCtx.setSearchDirs(CfgFileSearchDirs);
// First try to load configuration from the default files, return on error.
- if (loadDefaultConfigFiles(CfgFileSearchDirs))
+ if (loadDefaultConfigFiles(ExpCtx))
return true;
// Then load configuration files specified explicitly.
- llvm::SmallString<128> CfgFilePath;
+ std::string CfgFilePath;
if (CLOptions) {
for (auto CfgFileName : CLOptions->getAllArgValues(options::OPT_config)) {
// If argument contains directory separator, treat it as a path to
// configuration file.
if (llvm::sys::path::has_parent_path(CfgFileName)) {
- CfgFilePath = CfgFileName;
- if (llvm::sys::path::is_relative(CfgFilePath)) {
- if (getVFS().makeAbsolute(CfgFilePath))
+ llvm::SmallString<128> Path(CfgFileName);
+ if (llvm::sys::path::is_relative(Path)) {
+ if (getVFS().makeAbsolute(Path))
return true;
- auto Status = getVFS().status(CfgFilePath);
+ auto Status = getVFS().status(Path);
if (!Status ||
Status->getType() != llvm::sys::fs::file_type::regular_file) {
- Diag(diag::err_drv_config_file_not_exist) << CfgFilePath;
+ Diag(diag::err_drv_config_file_not_exist) << Path;
return true;
}
}
- } else if (!searchForFile(CfgFilePath, CfgFileSearchDirs, CfgFileName,
- getVFS())) {
+ CfgFilePath = Path.str();
+ } else if (!ExpCtx.findConfigFile(CfgFileName, CfgFilePath)) {
// Report an error that the config file could not be found.
Diag(diag::err_drv_config_file_not_found) << CfgFileName;
for (const StringRef &SearchDir : CfgFileSearchDirs)
@@ -1057,7 +1032,7 @@
}
// Try to read the config file, return on error.
- if (readConfigFile(CfgFilePath))
+ if (readConfigFile(CfgFilePath, ExpCtx))
return true;
}
}
@@ -1066,7 +1041,7 @@
return false;
}
-bool Driver::loadDefaultConfigFiles(ArrayRef<StringRef> CfgFileSearchDirs) {
+bool Driver::loadDefaultConfigFiles(llvm::cl::ExpansionContext &ExpCtx) {
// Disable default config if CLANG_NO_DEFAULT_CONFIG is set to a non-empty
// value.
if (const char *NoConfigEnv = ::getenv("CLANG_NO_DEFAULT_CONFIG")) {
@@ -1110,36 +1085,36 @@
// (e.g. i386-pc-linux-gnu.cfg + clang-g++.cfg for *clang-g++).
// Try loading <triple>-<mode>.cfg, and return if we find a match.
- llvm::SmallString<128> CfgFilePath;
+ std::string CfgFilePath;
std::string CfgFileName = Triple + '-' + RealMode + ".cfg";
- if (searchForFile(CfgFilePath, CfgFileSearchDirs, CfgFileName, getVFS()))
- return readConfigFile(CfgFilePath);
+ if (ExpCtx.findConfigFile(CfgFileName, CfgFilePath))
+ return readConfigFile(CfgFilePath, ExpCtx);
bool TryModeSuffix = !ClangNameParts.ModeSuffix.empty() &&
ClangNameParts.ModeSuffix != RealMode;
if (TryModeSuffix) {
CfgFileName = Triple + '-' + ClangNameParts.ModeSuffix + ".cfg";
- if (searchForFile(CfgFilePath, CfgFileSearchDirs, CfgFileName, getVFS()))
- return readConfigFile(CfgFilePath);
+ if (ExpCtx.findConfigFile(CfgFileName, CfgFilePath))
+ return readConfigFile(CfgFilePath, ExpCtx);
}
// Try loading <mode>.cfg, and return if loading failed. If a matching file
// was not found, still proceed on to try <triple>.cfg.
CfgFileName = RealMode + ".cfg";
- if (searchForFile(CfgFilePath, CfgFileSearchDirs, CfgFileName, getVFS())) {
- if (readConfigFile(CfgFilePath))
+ if (ExpCtx.findConfigFile(CfgFileName, CfgFilePath)) {
+ if (readConfigFile(CfgFilePath, ExpCtx))
return true;
} else if (TryModeSuffix) {
CfgFileName = ClangNameParts.ModeSuffix + ".cfg";
- if (searchForFile(CfgFilePath, CfgFileSearchDirs, CfgFileName, getVFS()) &&
- readConfigFile(CfgFilePath))
+ if (ExpCtx.findConfigFile(CfgFileName, CfgFilePath) &&
+ readConfigFile(CfgFilePath, ExpCtx))
return true;
}
// Try loading <triple>.cfg and return if we find a match.
CfgFileName = Triple + ".cfg";
- if (searchForFile(CfgFilePath, CfgFileSearchDirs, CfgFileName, getVFS()))
- return readConfigFile(CfgFilePath);
+ if (ExpCtx.findConfigFile(CfgFileName, CfgFilePath))
+ return readConfigFile(CfgFilePath, ExpCtx);
// If we were unable to find a config file deduced from executable name,
// that is not an error.
Index: clang/include/clang/Driver/Driver.h
===================================================================
--- clang/include/clang/Driver/Driver.h
+++ clang/include/clang/Driver/Driver.h
@@ -36,6 +36,9 @@
namespace vfs {
class FileSystem;
}
+namespace cl {
+class ExpansionContext;
+}
} // namespace llvm
namespace clang {
@@ -677,13 +680,14 @@
/// executable filename).
///
/// \returns true if error occurred.
- bool loadDefaultConfigFiles(ArrayRef<StringRef> CfgFileSearchDirs);
+ bool loadDefaultConfigFiles(llvm::cl::ExpansionContext &ExpCtx);
/// Read options from the specified file.
///
/// \param [in] FileName File to read.
+ /// \param [in] Search and expansion options.
/// \returns true, if error occurred while reading.
- bool readConfigFile(StringRef FileName);
+ bool readConfigFile(StringRef FileName, llvm::cl::ExpansionContext &ExpCtx);
/// Set the driver mode (cl, gcc, etc) from the value of the `--driver-mode`
/// option.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
