achieveartificialintelligence updated this revision to Diff 325609.
achieveartificialintelligence retitled this revision from "[Driver] replace
argc_ with argc" to "[clang][flang] Improve the consistency of the code-base".
achieveartificialintelligence edited the summary of this revision.
achieveartificialintelligence removed a reviewer: jhenderson.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D97138/new/
https://reviews.llvm.org/D97138
Files:
clang/tools/driver/driver.cpp
flang/tools/flang-driver/driver.cpp
Index: flang/tools/flang-driver/driver.cpp
===================================================================
--- flang/tools/flang-driver/driver.cpp
+++ flang/tools/flang-driver/driver.cpp
@@ -66,27 +66,27 @@
return 1;
}
-int main(int argc_, const char **argv_) {
+int main(int argC, const char **argV) {
// Initialize variables to call the driver
- llvm::InitLLVM x(argc_, argv_);
- llvm::SmallVector<const char *, 256> argv(argv_, argv_ + argc_);
+ llvm::InitLLVM x(argC, argV);
+ llvm::SmallVector<const char *, 256> argValues(argV, argV + argC);
clang::driver::ParsedClangName targetandMode("flang", "--driver-mode=flang");
- std::string driverPath = GetExecutablePath(argv[0]);
+ std::string driverPath = GetExecutablePath(argValues[0]);
// Check if flang-new is in the frontend mode
- auto firstArg = std::find_if(
- argv.begin() + 1, argv.end(), [](const char *a) { return a != nullptr; });
- if (firstArg != argv.end()) {
- if (llvm::StringRef(argv[1]).startswith("-cc1")) {
- llvm::errs() << "error: unknown integrated tool '" << argv[1] << "'. "
- << "Valid tools include '-fc1'.\n";
+ auto firstArg = std::find_if(argValues.begin() + 1, argValues.end(),
+ [](const char *a) { return a != nullptr; });
+ if (firstArg != argValues.end()) {
+ if (llvm::StringRef(argValues[1]).startswith("-cc1")) {
+ llvm::errs() << "error: unknown integrated tool '" << argValues[1]
+ << "'. " << "Valid tools include '-fc1'.\n";
return 1;
}
// Call flang-new frontend
- if (llvm::StringRef(argv[1]).startswith("-fc1")) {
- return ExecuteFC1Tool(argv);
+ if (llvm::StringRef(argValues[1]).startswith("-fc1")) {
+ return ExecuteFC1Tool(argValues);
}
}
@@ -94,14 +94,14 @@
// Create DiagnosticsEngine for the compiler driver
llvm::IntrusiveRefCntPtr<clang::DiagnosticOptions> diagOpts =
- CreateAndPopulateDiagOpts(argv);
+ CreateAndPopulateDiagOpts(argValues);
llvm::IntrusiveRefCntPtr<clang::DiagnosticIDs> diagID(
new clang::DiagnosticIDs());
Fortran::frontend::TextDiagnosticPrinter *diagClient =
new Fortran::frontend::TextDiagnosticPrinter(llvm::errs(), &*diagOpts);
diagClient->set_prefix(
- std::string(llvm::sys::path::stem(GetExecutablePath(argv[0]))));
+ std::string(llvm::sys::path::stem(GetExecutablePath(argValues[0]))));
clang::DiagnosticsEngine diags(diagID, &*diagOpts, diagClient);
@@ -110,7 +110,7 @@
llvm::sys::getDefaultTargetTriple(), diags, "flang LLVM compiler");
theDriver.setTargetAndMode(targetandMode);
std::unique_ptr<clang::driver::Compilation> c(
- theDriver.BuildCompilation(argv));
+ theDriver.BuildCompilation(argValues));
llvm::SmallVector<std::pair<int, const clang::driver::Command *>, 4>
failingCommands;
Index: clang/tools/driver/driver.cpp
===================================================================
--- clang/tools/driver/driver.cpp
+++ clang/tools/driver/driver.cpp
@@ -340,25 +340,25 @@
return 1;
}
-int main(int argc_, const char **argv_) {
+int main(int Argc, const char **Argv) {
noteBottomOfStack();
- llvm::InitLLVM X(argc_, argv_);
+ llvm::InitLLVM X(Argc, Argv);
llvm::setBugReportMsg("PLEASE submit a bug report to " BUG_REPORT_URL
" and include the crash backtrace, preprocessed "
"source, and associated run script.\n");
- SmallVector<const char *, 256> argv(argv_, argv_ + argc_);
+ SmallVector<const char *, 256> ArgValues(Argv, Argv + Argc);
if (llvm::sys::Process::FixupStandardFileDescriptors())
return 1;
llvm::InitializeAllTargets();
- auto TargetAndMode = ToolChain::getTargetAndModeFromProgramName(argv[0]);
+ auto TargetAndMode = ToolChain::getTargetAndModeFromProgramName(ArgValues[0]);
llvm::BumpPtrAllocator A;
llvm::StringSaver Saver(A);
// Parse response files using the GNU syntax, unless we're in CL mode. There
- // are two ways to put clang in CL compatibility mode: argv[0] is either
+ // are two ways to put clang in CL compatibility mode: ArgValues[0] is either
// clang-cl or cl, or --driver-mode=cl is on the command line. The normal
// command line parsing can't happen until after response file parsing, so we
// have to manually search for a --driver-mode=cl argument the hard way.
@@ -366,22 +366,22 @@
// response files written by clang will tokenize the same way in either mode.
bool ClangCLMode = false;
if (StringRef(TargetAndMode.DriverMode).equals("--driver-mode=cl") ||
- llvm::find_if(argv, [](const char *F) {
+ llvm::find_if(ArgValues, [](const char *F) {
return F && strcmp(F, "--driver-mode=cl") == 0;
- }) != argv.end()) {
+ }) != ArgValues.end()) {
ClangCLMode = true;
}
enum { Default, POSIX, Windows } RSPQuoting = Default;
- for (const char *F : argv) {
+ for (const char *F : ArgValues) {
if (strcmp(F, "--rsp-quoting=posix") == 0)
RSPQuoting = POSIX;
else if (strcmp(F, "--rsp-quoting=windows") == 0)
RSPQuoting = Windows;
}
- // Determines whether we want nullptr markers in argv to indicate response
- // files end-of-lines. We only use this for the /LINK driver argument with
- // clang-cl.exe on Windows.
+ // Determines whether we want nullptr markers in ArgValues to indicate
+ // response files end-of-lines. We only use this for the /LINK driver
+ // argument with clang-cl.exe on Windows.
bool MarkEOLs = ClangCLMode;
llvm::cl::TokenizerCallback Tokenizer;
@@ -390,31 +390,32 @@
else
Tokenizer = &llvm::cl::TokenizeGNUCommandLine;
- if (MarkEOLs && argv.size() > 1 && StringRef(argv[1]).startswith("-cc1"))
+ if (MarkEOLs && ArgValues.size() > 1 &&
+ StringRef(ArgValues[1]).startswith("-cc1"))
MarkEOLs = false;
- llvm::cl::ExpandResponseFiles(Saver, Tokenizer, argv, MarkEOLs);
+ llvm::cl::ExpandResponseFiles(Saver, Tokenizer, ArgValues, MarkEOLs);
// Handle -cc1 integrated tools, even if -cc1 was expanded from a response
// file.
- auto FirstArg = std::find_if(argv.begin() + 1, argv.end(),
+ auto FirstArg = std::find_if(ArgValues.begin() + 1, ArgValues.end(),
[](const char *A) { return A != nullptr; });
- if (FirstArg != argv.end() && StringRef(*FirstArg).startswith("-cc1")) {
+ if (FirstArg != ArgValues.end() && StringRef(*FirstArg).startswith("-cc1")) {
// If -cc1 came from a response file, remove the EOL sentinels.
if (MarkEOLs) {
- auto newEnd = std::remove(argv.begin(), argv.end(), nullptr);
- argv.resize(newEnd - argv.begin());
+ auto newEnd = std::remove(ArgValues.begin(), ArgValues.end(), nullptr);
+ ArgValues.resize(newEnd - ArgValues.begin());
}
- return ExecuteCC1Tool(argv);
+ return ExecuteCC1Tool(ArgValues);
}
// Handle options that need handling before the real command line parsing in
// Driver::BuildCompilation()
bool CanonicalPrefixes = true;
- for (int i = 1, size = argv.size(); i < size; ++i) {
+ for (int i = 1, size = ArgValues.size(); i < size; ++i) {
// Skip end-of-line response file markers
- if (argv[i] == nullptr)
+ if (ArgValues[i] == nullptr)
continue;
- if (StringRef(argv[i]) == "-no-canonical-prefixes") {
+ if (StringRef(ArgValues[i]) == "-no-canonical-prefixes") {
CanonicalPrefixes = false;
break;
}
@@ -430,7 +431,8 @@
getCLEnvVarOptions(OptCL.getValue(), Saver, PrependedOpts);
// Insert right after the program name to prepend to the argument list.
- argv.insert(argv.begin() + 1, PrependedOpts.begin(), PrependedOpts.end());
+ ArgValues.insert(ArgValues.begin() + 1, PrependedOpts.begin(),
+ PrependedOpts.end());
}
// Arguments in "_CL_" are appended.
llvm::Optional<std::string> Opt_CL_ = llvm::sys::Process::GetEnv("_CL_");
@@ -439,7 +441,7 @@
getCLEnvVarOptions(Opt_CL_.getValue(), Saver, AppendedOpts);
// Insert at the end of the argument list to append.
- argv.append(AppendedOpts.begin(), AppendedOpts.end());
+ ArgValues.append(AppendedOpts.begin(), AppendedOpts.end());
}
}
@@ -448,10 +450,10 @@
// scenes.
if (const char *OverrideStr = ::getenv("CCC_OVERRIDE_OPTIONS")) {
// FIXME: Driver shouldn't take extra initial argument.
- ApplyQAOverride(argv, OverrideStr, SavedStrings);
+ ApplyQAOverride(ArgValues, OverrideStr, SavedStrings);
}
- std::string Path = GetExecutablePath(argv[0], CanonicalPrefixes);
+ std::string Path = GetExecutablePath(ArgValues[0], CanonicalPrefixes);
// Whether the cc1 tool should be called inside the current process, or if we
// should spawn a new clang subprocess (old behavior).
@@ -460,7 +462,7 @@
bool UseNewCC1Process;
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts =
- CreateAndPopulateDiagOpts(argv, UseNewCC1Process);
+ CreateAndPopulateDiagOpts(ArgValues, UseNewCC1Process);
TextDiagnosticPrinter *DiagClient
= new TextDiagnosticPrinter(llvm::errs(), &*DiagOpts);
@@ -481,10 +483,10 @@
ProcessWarningOptions(Diags, *DiagOpts, /*ReportDiags=*/false);
Driver TheDriver(Path, llvm::sys::getDefaultTargetTriple(), Diags);
- SetInstallDir(argv, TheDriver, CanonicalPrefixes);
+ SetInstallDir(ArgValues, TheDriver, CanonicalPrefixes);
TheDriver.setTargetAndMode(TargetAndMode);
- insertTargetAndModeArgs(TargetAndMode, argv, SavedStrings);
+ insertTargetAndModeArgs(TargetAndMode, ArgValues, SavedStrings);
SetBackdoorDriverOutputsFromEnvVars(TheDriver);
@@ -494,7 +496,7 @@
llvm::CrashRecoveryContext::Enable();
}
- std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(argv));
+ std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(ArgValues));
int Res = 1;
bool IsCrash = false;
if (C && !C->containsError()) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
