From c0c7bca4e5b8d12699dc93a0da49e9e4bb79671b Mon Sep 17 00:00:00 2001 From: Roman Divacky Date: Sun, 21 Mar 2010 10:50:08 +0000 Subject: Update clang to r99115. --- lib/Driver/Arg.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/Driver/Arg.cpp') diff --git a/lib/Driver/Arg.cpp b/lib/Driver/Arg.cpp index a09ba095f119..7e61a1d414e0 100644 --- a/lib/Driver/Arg.cpp +++ b/lib/Driver/Arg.cpp @@ -10,6 +10,7 @@ #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" #include "clang/Driver/Option.h" +#include "llvm/ADT/Twine.h" #include "llvm/Support/raw_ostream.h" using namespace clang::driver; @@ -155,14 +156,12 @@ SeparateArg::SeparateArg(const Option *Opt, unsigned Index, unsigned _NumValues, void SeparateArg::render(const ArgList &Args, ArgStringList &Output) const { if (getOption().hasForceJoinedRender()) { assert(getNumValues() == 1 && "Cannot force joined render with > 1 args."); - // FIXME: Avoid std::string. - std::string Joined(getOption().getName()); - Joined += Args.getArgString(getIndex()); - Output.push_back(Args.MakeArgString(Joined.c_str())); + Output.push_back(Args.MakeArgString(llvm::StringRef(getOption().getName()) + + getValue(Args, 0))); } else { Output.push_back(Args.getArgString(getIndex())); for (unsigned i = 0; i < NumValues; ++i) - Output.push_back(Args.getArgString(getIndex() + 1 + i)); + Output.push_back(getValue(Args, i)); } } -- cgit v1.3