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

Driver: rename Name.swiftmodule/Private directory to Name.swiftmodule/Project

Browse Source 
This directory should be excluded during installation since the content is only
used for local development. swiftsourceinfo file is currently emitted to this directory.
This commit is contained in:
Xi Ge
2019-10-07 17:21:12 -07:00
parent dd33540231
commit dec878360f
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -273,27 +273,27 @@ SerializedModuleLoaderBase::openModuleSourceInfoFile(AccessPathElem ModuleID,
llvm::vfs::FileSystem &FS = *Ctx.SourceMgr.getFileSystem();
{
llvm::SmallString<128> PrivatePath(ModulePath);
llvm::sys::path::remove_filename(PrivatePath);
llvm::sys::path::append(PrivatePath, "Private");
llvm::sys::path::append(PrivatePath, ModuleSourceInfoFilename);
llvm::SmallString<128> ProjectPath(ModulePath);
llvm::sys::path::remove_filename(ProjectPath);
llvm::sys::path::append(ProjectPath, "Project");
llvm::sys::path::append(ProjectPath, ModuleSourceInfoFilename);
// Try to open the module source info file. If it does not exist, ignore
// the error. However, pass though all other errors.
if (llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> ModuleSourceInfoOrErr =
FS.getBufferForFile(PrivatePath)) {
FS.getBufferForFile(ProjectPath)) {
*ModuleSourceInfoBuffer = std::move(*ModuleSourceInfoOrErr);
return std::error_code();
}
}
{
llvm::SmallString<128> NonPrivatePath(ModulePath);
llvm::sys::path::remove_filename(NonPrivatePath);
llvm::sys::path::append(NonPrivatePath, ModuleSourceInfoFilename);
llvm::SmallString<128> NonProjectPath(ModulePath);
llvm::sys::path::remove_filename(NonProjectPath);
llvm::sys::path::append(NonProjectPath, ModuleSourceInfoFilename);
// Try to open the module source info file adjacent to the .swiftmodule file.
if (llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> ModuleSourceInfoOrErr =
FS.getBufferForFile(NonPrivatePath)) {
FS.getBufferForFile(NonProjectPath)) {
*ModuleSourceInfoBuffer = std::move(*ModuleSourceInfoOrErr);
return std::error_code();
}