1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Driver/Arg.cpp b/lib/Driver/Arg.cpp
index 625e784579..6cff93e64a 100644
--- a/lib/Driver/Arg.cpp
+++ b/lib/Driver/Arg.cpp
@@ -142,6 +142,7 @@ void JoinedAndSeparateArg::render(const ArgList &Args,
 const char *JoinedAndSeparateArg::getValue(const ArgList &Args, 
                                            unsigned N) const {
   assert(N < getNumValues() && "Invalid index.");
-  assert(0 && "FIXME: Implement");
-  return 0;
+  if (N == 0)
+    return Args.getArgString(getIndex()) + strlen(getOption().getName());
+  return Args.getArgString(getIndex() + 1);
 }