RemoteMirror: Don't store StringRefs to temporary std::strings

Author: slavapestov

include/swift/RemoteInspection/TypeRef.h

@@ -364,10 +364,10 @@ class BoundGenericTypeRef final : public TypeRef, public NominalTypeTrait {
 class TupleTypeRef final : public TypeRef {
 protected:
   std::vector<const TypeRef *> Elements;
-  std::vector<StringRef> Labels;
+  std::vector<std::string> Labels;
 
   static TypeRefID Profile(const std::vector<const TypeRef *> &Elements,
-                           const std::vector<StringRef> &Labels) {
+                           const std::vector<std::string> &Labels) {
     TypeRefID ID;
     for (auto Element : Elements)
       ID.addPointer(Element);
@@ -378,20 +378,20 @@ class TupleTypeRef final : public TypeRef {
 
 public:
   TupleTypeRef(std::vector<const TypeRef *> Elements,
-               std::vector<StringRef> Labels)
+               std::vector<std::string> Labels)
       : TypeRef(TypeRefKind::Tuple), Elements(std::move(Elements)),
         Labels(std::move(Labels)) {}
 
   template <typename Allocator>
   static const TupleTypeRef *create(Allocator &A,
                                     std::vector<const TypeRef *> Elements,
-                                    const std::vector<StringRef> Labels) {
+                                    const std::vector<std::string> Labels) {
     FIND_OR_CREATE_TYPEREF(A, TupleTypeRef, Elements, Labels);
   }
 
   const std::vector<const TypeRef *> &getElements() const { return Elements; };
 
-  const std::vector<llvm::StringRef> &getLabels() const { return Labels; }
+  const std::vector<std::string> &getLabels() const { return Labels; }
 
   static bool classof(const TypeRef *TR) {
     return TR->getKind() == TypeRefKind::Tuple;

include/swift/RemoteInspection/TypeRefBuilder.h

@@ -744,7 +744,8 @@ class TypeRefBuilder {
 
   const TupleTypeRef *createTupleType(llvm::ArrayRef<const TypeRef *> elements,
                                       llvm::ArrayRef<StringRef> labels) {
-    return TupleTypeRef::create(*this, elements, labels);
+    std::vector<std::string> labelsVec(labels.begin(), labels.end());
+    return TupleTypeRef::create(*this, elements, labelsVec);
   }
 
   const TypeRef *createPackType(llvm::ArrayRef<const TypeRef *> elements) {

stdlib/public/RemoteInspection/TypeRef.cpp

@@ -116,7 +116,7 @@ class PrintTypeRef : public TypeRefVisitor<PrintTypeRef, void> {
     for (auto NameElement : llvm::zip_first(Labels, T->getElements())) {
       auto Label = std::get<0>(NameElement);
       if (!Label.empty())
-        stream << Label.str() << " = ";
+        stream << Label << " = ";
       printRec(std::get<1>(NameElement));
     }
     stream << ")";