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

Adapt to llvm.org StringRef API change

Browse Source
This commit is contained in:
Fred Riss
2020-01-31 15:31:50 -08:00
committed by Michael Forster
parent 710799dd09
commit 259d78a350
99 changed files with 346 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -46,14 +46,13 @@ std::string
swift::getModuleCachePathFromClang(const clang::CompilerInstance &Clang) {
if (!Clang.hasPreprocessor())
return "";
std::string SpecificModuleCachePath = Clang.getPreprocessor()
.getHeaderSearchInfo()
.getModuleCachePath();
std::string SpecificModuleCachePath =
Clang.getPreprocessor().getHeaderSearchInfo().getModuleCachePath().str();
// The returned-from-clang module cache path includes a suffix directory
// that is specific to the clang version and invocation; we want the
// directory above that.
return llvm::sys::path::parent_path(SpecificModuleCachePath);
return llvm::sys::path::parent_path(SpecificModuleCachePath).str();
}
#pragma mark - Forwarding Modules
@@ -241,7 +240,7 @@ struct ModuleRebuildInfo {
for (auto &mod : outOfDateModules) {
if (mod.path == path) return mod;
}
outOfDateModules.push_back({path, None, ModuleKind::Normal, {}, {}});
outOfDateModules.push_back({path.str(), None, ModuleKind::Normal, {}, {}});
return outOfDateModules.back();
}
@@ -261,14 +260,14 @@ struct ModuleRebuildInfo {
/// at \c modulePath.
void addOutOfDateDependency(StringRef modulePath, StringRef depPath) {
getOrInsertOutOfDateModule(modulePath)
.outOfDateDependencies.push_back(depPath);
.outOfDateDependencies.push_back(depPath.str());
}
/// Registers a missing dependency at \c depPath for the module
/// at \c modulePath.
void addMissingDependency(StringRef modulePath, StringRef depPath) {
getOrInsertOutOfDateModule(modulePath)
.missingDependencies.push_back(depPath);
.missingDependencies.push_back(depPath.str());
}
/// Determines if we saw the given module path and registered is as out of