Merge pull request #33186 from nathawes/fix-more-string-conversion-issues

[master-rebranch] Fix more string conversion build issues

Author: Nathan Hawes

include/swift/Frontend/ModuleInterfaceLoader.h

@@ -243,11 +243,11 @@ class ExplicitModuleMapParser {
       if (key == "moduleName") {
         moduleName = val;
       } else if (key == "modulePath") {
-        result.modulePath = val;
+        result.modulePath = val.str();
       } else if (key == "docPath") {
-        result.moduleDocPath = val;
+        result.moduleDocPath = val.str();
       } else if (key == "sourceInfoPath") {
-        result.moduleSourceInfoPath = val;
+        result.moduleSourceInfoPath = val.str();
       } else {
         // Being forgiving for future fields.
         continue;