averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Cherry-pick StringRef->std::string conversion fixes into `master`
This commit is contained in:
Dmitri Gribenko
2020-03-17 12:09:36 +01:00
committed by GitHub
parent 2af51be6e6 345a9147ec
commit 841eeb05b0
107 changed files with 363 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Frontend/ModuleInterfaceBuilder.cpp
View File

@@ -77,7 +77,7 @@ void ModuleInterfaceBuilder::configureSubInvocationInputsAndOutputs(
SOPs.ModuleOutputPath = OutPath.str();
// Pick a primary output path that will cause problems to use.
StringRef MainOut = "/<unused>";
std::string MainOut = "/<unused>";
SubFEOpts.InputsAndOutputs
.setMainAndSupplementaryOutputs({MainOut}, {SOPs});
}
@@ -98,7 +98,7 @@ void ModuleInterfaceBuilder::configureSubInvocation(
subInvocation.setModuleName(moduleName);
subInvocation.setClangModuleCachePath(moduleCachePath);
subInvocation.getFrontendOptions().PrebuiltModuleCachePath =
prebuiltCachePath;
prebuiltCachePath.str();
subInvocation.getFrontendOptions().TrackSystemDeps = trackSystemDependencies;
// Respect the detailed-record preprocessor setting of the parent context.
@@ -373,7 +373,7 @@ bool ModuleInterfaceBuilder::buildSwiftModuleInternal(
// Setup the callbacks for serialization, which can occur during the
// optimization pipeline.
SerializationOptions SerializationOpts;
std::string OutPathStr = OutPath;
std::string OutPathStr = OutPath.str();
SerializationOpts.OutputPath = OutPathStr.c_str();
SerializationOpts.ModuleLinkName = FEOpts.ModuleLinkName;
SerializationOpts.AutolinkForceLoad =