Skip to content

[master-next] NFC: Rename variable from PR #17494 #17507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions tools/driver/driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,24 +180,23 @@ static int run_driver(StringRef ExecName,
}

int main(int argc_, const char **argv_) {
SmallVector<const char *, 256> args(&argv_[0], &argv_[argc_]);

// Expand any response files in the command line argument vector - arguments
// may be passed through response files in the event of command line length
// restrictions.
SmallVector<const char *, 256> ExpandedArgs(&argv_[0], &argv_[argc_]);
llvm::BumpPtrAllocator Allocator;
llvm::StringSaver Saver(Allocator);
llvm::cl::ExpandResponseFiles(
Saver,
llvm::Triple(llvm::sys::getProcessTriple()).isOSWindows() ?
llvm::cl::TokenizeWindowsCommandLine :
llvm::cl::TokenizeGNUCommandLine,
args);
ExpandedArgs);

// Initialize the stack trace using the parsed argument vector with expanded
// response files.
int ExpandedArgc = args.size();
const char **ExpandedArgv = args.data();
int ExpandedArgc = ExpandedArgs.size();
const char **ExpandedArgv = ExpandedArgs.data();
PROGRAM_START(ExpandedArgc, ExpandedArgv);
SmallVector<const char *, 256> argv(&ExpandedArgv[0],
&ExpandedArgv[ExpandedArgc]);
Expand Down