Driver: Allow Render{Separate,Joined} option flags on JoinedOrSeparate option types.

Also, simplify/fix SeparateArg::render with forced join.

llvm-svn: 99022

2 files changed, 8 insertions, 7 deletions

diff --git a/clang/lib/Driver/Arg.cpp b/clang/lib/Driver/Arg.cpp
index a09ba095f11..7e61a1d414e 100644
--- a/clang/lib/Driver/Arg.cpp
+++ b/clang/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));
   }
 }
 
diff --git a/clang/lib/Driver/OptTable.cpp b/clang/lib/Driver/OptTable.cpp
index f69d5d806d2..de1e4592b34 100644
--- a/clang/lib/Driver/OptTable.cpp
+++ b/clang/lib/Driver/OptTable.cpp
@@ -167,11 +167,13 @@ Option *OptTable::CreateOption(unsigned id) const {
   if (info.Flags & RenderAsInput)
     Opt->setNoOptAsInput(true);
   if (info.Flags & RenderJoined) {
-    assert(info.Kind == Option::SeparateClass && "Invalid option.");
+    assert((info.Kind == Option::JoinedOrSeparateClass ||
+            info.Kind == Option::SeparateClass) && "Invalid option.");
     Opt->setForceJoinedRender(true);
   }
   if (info.Flags & RenderSeparate) {
-    assert(info.Kind == Option::JoinedClass && "Invalid option.");
+    assert((info.Kind == Option::JoinedOrSeparateClass ||
+            info.Kind == Option::JoinedClass) && "Invalid option.");
     Opt->setForceSeparateRender(true);
   }
   if (info.Flags & Unsupported)