From 952eddef9aff85b1e92626e89baaf7a360e2ac85 Mon Sep 17 00:00:00 2001 From: dim Date: Sun, 22 Dec 2013 00:07:40 +0000 Subject: Vendor import of clang release_34 branch r197841 (effectively, 3.4 RC3): https://llvm.org/svn/llvm-project/cfe/branches/release_34@197841 --- lib/Frontend/CreateInvocationFromCommandLine.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/Frontend/CreateInvocationFromCommandLine.cpp') diff --git a/lib/Frontend/CreateInvocationFromCommandLine.cpp b/lib/Frontend/CreateInvocationFromCommandLine.cpp index e25eb43..78f39d4 100644 --- a/lib/Frontend/CreateInvocationFromCommandLine.cpp +++ b/lib/Frontend/CreateInvocationFromCommandLine.cpp @@ -13,15 +13,16 @@ #include "clang/Frontend/Utils.h" #include "clang/Basic/DiagnosticOptions.h" -#include "clang/Driver/ArgList.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" #include "clang/Driver/Tool.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendDiagnostic.h" +#include "llvm/Option/ArgList.h" #include "llvm/Support/Host.h" using namespace clang; +using namespace llvm::opt; /// createInvocationFromCommandLine - Construct a compiler invocation object for /// a command line argument vector. @@ -55,7 +56,7 @@ clang::createInvocationFromCommandLine(ArrayRef ArgList, // Just print the cc1 options if -### was present. if (C->getArgs().hasArg(driver::options::OPT__HASH_HASH_HASH)) { - C->PrintJob(llvm::errs(), C->getJobs(), "\n", true); + C->getJobs().Print(llvm::errs(), "\n", true); return 0; } @@ -65,7 +66,7 @@ clang::createInvocationFromCommandLine(ArrayRef ArgList, if (Jobs.size() != 1 || !isa(*Jobs.begin())) { SmallString<256> Msg; llvm::raw_svector_ostream OS(Msg); - C->PrintJob(OS, C->getJobs(), "; ", true); + Jobs.Print(OS, "; ", true); Diags->Report(diag::err_fe_expected_compiler_job) << OS.str(); return 0; } @@ -76,7 +77,7 @@ clang::createInvocationFromCommandLine(ArrayRef ArgList, return 0; } - const driver::ArgStringList &CCArgs = Cmd->getArguments(); + const ArgStringList &CCArgs = Cmd->getArguments(); OwningPtr CI(new CompilerInvocation()); if (!CompilerInvocation::CreateFromArgs(*CI, const_cast(CCArgs.data()), -- cgit v1.1