6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-02 19:24:25 +00:00
Code Issues Projects Releases Wiki Activity

ArrayRef-ify libDriverMain

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240234 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie
2015-06-21 06:31:56 +00:00
parent 006bce7764
commit fa6a5de95b
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/LibDriver/LibDriver.cpp
View File

@ -103,19 +103,18 @@ static Optional<std::string> findInputFile(StringRef File,
return Optional<std::string>();
}
int llvm::libDriverMain(int Argc, const char **Argv) {
SmallVector<const char *, 20> NewArgv(Argv, Argv + Argc);
int llvm::libDriverMain(llvm::ArrayRef<const char*> ArgsArr) {
SmallVector<const char *, 20> NewArgs(ArgsArr.begin(), ArgsArr.end());
BumpPtrAllocator Alloc;
BumpPtrStringSaver Saver(Alloc);
cl::ExpandResponseFiles(Saver, cl::TokenizeWindowsCommandLine, NewArgv);
Argv = &NewArgv[0];
Argc = static_cast<int>(NewArgv.size());
cl::ExpandResponseFiles(Saver, cl::TokenizeWindowsCommandLine, NewArgs);
ArgsArr = NewArgs;
LibOptTable Table;
unsigned MissingIndex;
unsigned MissingCount;
std::unique_ptr<llvm::opt::InputArgList> Args(Table.ParseArgs(
makeArrayRef(Argv, Argc).slice(1), MissingIndex, MissingCount));
std::unique_ptr<llvm::opt::InputArgList> Args(
Table.ParseArgs(ArgsArr.slice(1), MissingIndex, MissingCount));
if (MissingCount) {
llvm::errs() << "missing arg value for \""
<< Args->getArgString(MissingIndex)
@ -148,7 +147,7 @@ int llvm::libDriverMain(int Argc, const char **Argv) {
getOutputPath(Args.get()), Members, /*WriteSymtab=*/true);
if (Result.second) {
if (Result.first.empty())
Result.first = Argv[0];
Result.first = ArgsArr[0];
llvm::errs() << Result.first << ": " << Result.second.message() << "\n";
return 1;
}