1 files changed, 2 insertions, 11 deletions
diff --git a/lib/Option/ArgList.cpp b/lib/Option/ArgList.cpp
index 18a7b5982b..15f7e8bf4b 100644
--- a/lib/Option/ArgList.cpp
+++ b/lib/Option/ArgList.cpp
@@ -323,18 +323,9 @@ InputArgList::~InputArgList() {
 unsigned InputArgList::MakeIndex(StringRef String0) const {
   unsigned Index = ArgStrings.size();
 
-  // If necessary, make a copy so we can null terminate it.
-  std::string NullTerminated;
-  if (String0.back() != '\0') {
-    NullTerminated.append(String0.data(), String0.size());
-    NullTerminated.push_back('\0');
-    String0 = StringRef(&NullTerminated[0], NullTerminated.size());
-  }
-
   // Tuck away so we have a reliable const char *.
-  String0 = SynthesizedStrings.GetOrCreateValue(String0).getKey();
-  assert(String0.back() == '\0');
-  ArgStrings.push_back(String0.data());
+  SynthesizedStrings.push_back(String0);
+  ArgStrings.push_back(SynthesizedStrings.back().c_str());
 
   return Index;
 }