diff options
| author | David Blaikie <dblaikie@gmail.com> | 2012-02-07 19:36:38 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2012-02-07 19:36:38 +0000 |
| commit | 09d20eefaa5d0dcdd17db45e4065a23396dcb574 (patch) | |
| tree | 7fc313fd1e380d2ef7f870b36667e341ea156fb1 | |
| parent | 0210e976805795df6cbc59024f622c8e42622e55 (diff) | |
| download | bcm5719-llvm-09d20eefaa5d0dcdd17db45e4065a23396dcb574.tar.gz bcm5719-llvm-09d20eefaa5d0dcdd17db45e4065a23396dcb574.zip | |
Make use of const-correct ParseCommandLineOptions
llvm-svn: 150000
| -rw-r--r-- | clang/lib/CodeGen/BackendUtil.cpp | 5 | ||||
| -rw-r--r-- | clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp | 2 | ||||
| -rw-r--r-- | clang/tools/arcmt-test/arcmt-test.cpp | 2 | ||||
| -rw-r--r-- | clang/tools/driver/cc1as_main.cpp | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 1707ec5ea5c..e2447340c11 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -246,8 +246,7 @@ bool EmitAssemblyHelper::AddEmitPasses(BackendAction Action, CM = llvm::CodeModel::Default; } - std::vector<const char *> BackendArgs; - BackendArgs.reserve(16); + SmallVector<const char *, 16> BackendArgs; BackendArgs.push_back("clang"); // Fake program name. if (!CodeGenOpts.DebugPass.empty()) { BackendArgs.push_back("-debug-pass"); @@ -265,7 +264,7 @@ bool EmitAssemblyHelper::AddEmitPasses(BackendAction Action, BackendArgs.push_back("-global-merge=false"); BackendArgs.push_back(0); llvm::cl::ParseCommandLineOptions(BackendArgs.size() - 1, - const_cast<char **>(&BackendArgs[0])); + BackendArgs.data()); std::string FeaturesStr; if (TargetOpts.Features.size()) { diff --git a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp index c965692cac6..0841b2cef81 100644 --- a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp @@ -157,7 +157,7 @@ bool clang::ExecuteCompilerInvocation(CompilerInstance *Clang) { for (unsigned i = 0; i != NumArgs; ++i) Args[i + 1] = Clang->getFrontendOpts().LLVMArgs[i].c_str(); Args[NumArgs + 1] = 0; - llvm::cl::ParseCommandLineOptions(NumArgs + 1, const_cast<char **>(Args)); + llvm::cl::ParseCommandLineOptions(NumArgs + 1, Args); } // Honor -analyzer-checker-help. diff --git a/clang/tools/arcmt-test/arcmt-test.cpp b/clang/tools/arcmt-test/arcmt-test.cpp index 6efb7079500..2fd14441590 100644 --- a/clang/tools/arcmt-test/arcmt-test.cpp +++ b/clang/tools/arcmt-test/arcmt-test.cpp @@ -353,7 +353,7 @@ int main(int argc, const char **argv) { if (StringRef(argv[optargc]) == "--args") break; } - llvm::cl::ParseCommandLineOptions(optargc, const_cast<char **>(argv), "arcmt-test"); + llvm::cl::ParseCommandLineOptions(optargc, argv, "arcmt-test"); if (VerifyTransformedFiles) { if (ResultFiles.empty()) { diff --git a/clang/tools/driver/cc1as_main.cpp b/clang/tools/driver/cc1as_main.cpp index 14ff1e03ac3..84aeced4115 100644 --- a/clang/tools/driver/cc1as_main.cpp +++ b/clang/tools/driver/cc1as_main.cpp @@ -413,7 +413,7 @@ int cc1as_main(const char **ArgBegin, const char **ArgEnd, for (unsigned i = 0; i != NumArgs; ++i) Args[i + 1] = Asm.LLVMArgs[i].c_str(); Args[NumArgs + 1] = 0; - llvm::cl::ParseCommandLineOptions(NumArgs + 1, const_cast<char **>(Args)); + llvm::cl::ParseCommandLineOptions(NumArgs + 1, Args); } // Execute the invocation, unless there were parsing errors. |
