Merge pull request swiftlang#30504 from benlangmuir/1604-next

Fix Ubuntu 16.04 master-next build

Author: benlangmuir

lib/Driver/ParseableOutput.cpp

@@ -141,7 +141,7 @@ class DetailedCommandBasedMessage : public CommandBasedMessage {
     }
     file_types::forAllTypes([&](file_types::ID Ty) {
       for (auto Output : Cmd.getOutput().getAdditionalOutputsForType(Ty)) {
-        Outputs.push_back(OutputPair(Ty, Output));
+        Outputs.push_back(OutputPair(Ty, Output.str()));
       }
     });
   }

lib/Index/IndexRecord.cpp

@@ -528,7 +528,7 @@ emitDataForSwiftSerializedModule(ModuleDecl *module,
                                 indexStorePath.str(), &diags, outRecordFile);
       if (failed)
         return false;
-      records.emplace_back(outRecordFile, moduleName.str());
+      records.emplace_back(outRecordFile, moduleName.str().str());
       return true;
     });
     indexModule(module, groupIndexConsumer);