Merge pull request swiftlang#30471 from benlangmuir/more-str

More explicit StringRef -> std::string conversions

Author: benlangmuir

include/swift/Basic/PathRemapper.h

@@ -39,7 +39,7 @@ class PathRemapper {
   /// Adds a mapping such that any paths starting with `FromPrefix` have that
   /// portion replaced with `ToPrefix`.
   void addMapping(StringRef FromPrefix, StringRef ToPrefix) {
-    PathMappings.emplace_back(FromPrefix, ToPrefix);
+    PathMappings.emplace_back(FromPrefix.str(), ToPrefix.str());
   }
 
   /// Returns a remapped `Path` if it starts with a prefix in the map; otherwise

lib/Driver/FineGrainedDependencyDriverGraph.cpp

@@ -178,7 +178,7 @@ std::vector<const Job *> ModuleDepGraph::jobsContaining(
 void ModuleDepGraph::registerJob(const Job *job) {
   // No need to create any nodes; that will happen when the swiftdeps file is
   // read. Just record the correspondence.
-  jobsBySwiftDeps.insert(std::make_pair(getSwiftDeps(job), job));
+  jobsBySwiftDeps.insert(std::make_pair(getSwiftDeps(job).str(), job));
 }
 
 std::vector<const Job *> ModuleDepGraph::getAllJobs() const {

lib/Driver/ParseableOutput.cpp

@@ -136,7 +136,7 @@ class DetailedCommandBasedMessage : public CommandBasedMessage {
     if (PrimaryOutputType != file_types::TY_Nothing) {
       for (llvm::StringRef OutputFileName :
            Cmd.getOutput().getPrimaryOutputFilenames()) {
-        Outputs.push_back(OutputPair(PrimaryOutputType, OutputFileName));
+        Outputs.push_back(OutputPair(PrimaryOutputType, OutputFileName.str()));
       }
     }
     file_types::forAllTypes([&](file_types::ID Ty) {