projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ArrayRef-ify libDriverMain
[oota-llvm.git]
/
lib
/
LibDriver
/
LibDriver.cpp
diff --git
a/lib/LibDriver/LibDriver.cpp
b/lib/LibDriver/LibDriver.cpp
index 0b7c4756d0a66f971850c33cdff180d7c3189f00..e441fe84c39b673fdf891f87d17444a9ba3f32b9 100644
(file)
--- a/
lib/LibDriver/LibDriver.cpp
+++ b/
lib/LibDriver/LibDriver.cpp
@@
-103,19
+103,18
@@
static Optional<std::string> findInputFile(StringRef File,
return Optional<std::string>();
}
return Optional<std::string>();
}
-int llvm::libDriverMain(
int Argc, const char **Argv
) {
- SmallVector<const char *, 20> NewArg
v(Argv, Argv + Argc
);
+int llvm::libDriverMain(
llvm::ArrayRef<const char*> ArgsArr
) {
+ SmallVector<const char *, 20> NewArg
s(ArgsArr.begin(), ArgsArr.end()
);
BumpPtrAllocator Alloc;
BumpPtrStringSaver Saver(Alloc);
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;
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)
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())
getOutputPath(Args.get()), Members, /*WriteSymtab=*/true);
if (Result.second) {
if (Result.first.empty())
- Result.first = Arg
v
[0];
+ Result.first = Arg
sArr
[0];
llvm::errs() << Result.first << ": " << Result.second.message() << "\n";
return 1;
}
llvm::errs() << Result.first << ": " << Result.second.message() << "\n";
return 1;
}