Merge pull request swiftlang#30403 from MForster/forster/string-fixes

Cherry-pick StringRef->std::string conversion fixes into `master`

Author: gribozavr

include/swift/ABI/TypeIdentity.h

@@ -129,16 +129,16 @@ class TypeImportInfo {
     value = value.drop_front(1);
 
     switch (component) {
-#define case_setIfNonEmpty(FIELD)                                      \
-    case TypeImportComponent::FIELD:                                   \
-      check(!value.empty(), "incoming value of " #FIELD " was empty"); \
-      check(FIELD.empty(), #FIELD " was already set");                 \
-      FIELD = value;                                                   \
-      return true;                                                     \
-
-    case_setIfNonEmpty(ABIName)
-    case_setIfNonEmpty(SymbolNamespace)
-    case_setIfNonEmpty(RelatedEntityName)
+#define case_setIfNonEmpty(FIELD)                                              \
+  case TypeImportComponent::FIELD:                                             \
+    check(!value.empty(), "incoming value of " #FIELD " was empty");           \
+    check(FIELD.empty(), #FIELD " was already set");                           \
+    FIELD = StringType(value);                                                 \
+    return true;
+
+      case_setIfNonEmpty(ABIName)
+      case_setIfNonEmpty(SymbolNamespace)
+      case_setIfNonEmpty(RelatedEntityName)
 
 #undef case_setIfNonEmpty
 #undef check

include/swift/AST/Identifier.h

@@ -83,7 +83,9 @@ class Identifier {
   const char *get() const { return Pointer; }
 
   StringRef str() const { return Pointer; }
-  
+
+  explicit operator std::string() const { return std::string(Pointer); }
+
   unsigned getLength() const {
     assert(Pointer != nullptr && "Tried getting length of empty identifier");
     return ::strlen(Pointer);

include/swift/Basic/LangOptions.h

@@ -369,7 +369,7 @@ namespace swift {
     /// compiler flag.
     void addCustomConditionalCompilationFlag(StringRef Name) {
       assert(!Name.empty());
-      CustomConditionalCompilationFlags.push_back(Name);
+      CustomConditionalCompilationFlags.push_back(Name.str());
     }
 
     /// Determines if a given conditional compilation flag has been set.

include/swift/Demangling/TypeDecoder.h

@@ -384,7 +384,7 @@ class TypeDecoder {
     }
     case NodeKind::BuiltinTypeName: {
       auto mangledName = Demangle::mangleNode(Node);
-      return Builder.createBuiltinType(Node->getText(), mangledName);
+      return Builder.createBuiltinType(Node->getText().str(), mangledName);
     }
     case NodeKind::Metatype:
     case NodeKind::ExistentialMetatype: {
@@ -683,12 +683,12 @@ class TypeDecoder {
       auto assocTypeChild = Node->getChild(1);
       auto member = assocTypeChild->getFirstChild()->getText();
       if (assocTypeChild->getNumChildren() < 2)
-        return Builder.createDependentMemberType(member, base);
+        return Builder.createDependentMemberType(member.str(), base);
 
       auto protocol = decodeMangledProtocolType(assocTypeChild->getChild(1));
       if (!protocol)
         return BuiltType();
-      return Builder.createDependentMemberType(member, base, protocol);
+      return Builder.createDependentMemberType(member.str(), base, protocol);
     }
     case NodeKind::DependentAssociatedTypeRef: {
       if (Node->getNumChildren() < 2)

include/swift/Remote/MetadataReader.h

@@ -823,7 +823,7 @@ class MetadataReader {
 
 #if SWIFT_OBJC_INTEROP
         BuiltProtocolDecl objcProtocol(StringRef name) {
-          return builder.createObjCProtocolDecl(name);
+          return builder.createObjCProtocolDecl(name.str());
         }
 #endif
       } resolver{Builder};

include/swift/SIL/SILFunction.h

@@ -692,7 +692,7 @@ class SILFunction
   void addSemanticsAttr(StringRef Ref) {
     if (hasSemanticsAttr(Ref))
       return;
-    SemanticsAttrSet.push_back(Ref);
+    SemanticsAttrSet.push_back(Ref.str());
     std::sort(SemanticsAttrSet.begin(), SemanticsAttrSet.end());
   }
 

lib/AST/ASTContext.cpp

@@ -1431,7 +1431,7 @@ void ASTContext::addSearchPath(StringRef searchPath, bool isFramework,
   if (isFramework)
     SearchPathOpts.FrameworkSearchPaths.push_back({searchPath, isSystem});
   else
-    SearchPathOpts.ImportSearchPaths.push_back(searchPath);
+    SearchPathOpts.ImportSearchPaths.push_back(searchPath.str());
 
   if (auto *clangLoader = getClangModuleLoader())
     clangLoader->addSearchPath(searchPath, isFramework, isSystem);

lib/AST/ASTPrinter.cpp

@@ -272,7 +272,7 @@ std::string ASTPrinter::sanitizeUtf8(StringRef Text) {
     }
     Data += Step;
   }
-  return Builder.str();
+  return std::string(Builder.str());
 }
 
 void ASTPrinter::anchor() {}
@@ -4543,7 +4543,7 @@ AnyFunctionType::getParamListAsString(ArrayRef<AnyFunctionType::Param> Params,
   SmallString<16> Scratch;
   llvm::raw_svector_ostream OS(Scratch);
   AnyFunctionType::printParams(Params, OS);
-  return OS.str();
+  return std::string(OS.str());
 }
 
 void LayoutConstraintInfo::print(raw_ostream &OS,

lib/AST/DiagnosticEngine.cpp

@@ -989,7 +989,7 @@ void DiagnosticEngine::emitDiagnostic(const Diagnostic &diagnostic) {
       while (associatedNotes && *associatedNotes) {
         SmallString<128> notePath(getDiagnosticDocumentationPath());
         llvm::sys::path::append(notePath, *associatedNotes);
-        educationalNotePaths.push_back(notePath.str());
+        educationalNotePaths.push_back(notePath.str().str());
         associatedNotes++;
       }
       info->EducationalNotePaths = educationalNotePaths;

lib/AST/Module.cpp

@@ -2409,7 +2409,7 @@ StringRef ModuleEntity::getName() const {
 std::string ModuleEntity::getFullName() const {
   assert(!Mod.isNull());
   if (auto SwiftMod = Mod.dyn_cast<const ModuleDecl*>())
-    return SwiftMod->getName().str();
+    return std::string(SwiftMod->getName());
   return getClangModule(Mod)->getFullModuleName();
 }