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

Accept directory-style swiftmodules outside of frameworks as well.

Browse Source 
This is needed for unit tests to import app modules, but could also be used
to get rid of the "/32" used for the standard libraries.

This is the rest of <rdar://problem/16776466>

Swift SVN r17177
This commit is contained in:
Jordan Rose
2014-05-01 20:40:11 +00:00
parent 79dc7a3716
commit 7a975e6fad
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -73,13 +73,35 @@ findModule(ASTContext &ctx, AccessPathElem moduleID,
moduleDocFilename += '.';
moduleDocFilename += SERIALIZED_MODULE_DOC_EXTENSION;
// FIXME: Which name should we be using here? Do we care about CPU subtypes?
// FIXME: At the very least, don't hardcode "arch".
llvm::SmallString<16> archFile(ctx.LangOpts.getTargetConfigOption("arch"));
llvm::SmallString<16> archDocFile(ctx.LangOpts.getTargetConfigOption("arch"));
if (!archFile.empty()) {
archFile += '.';
archFile += SERIALIZED_MODULE_EXTENSION;
archDocFile += '.';
archDocFile += SERIALIZED_MODULE_DOC_EXTENSION;
}
llvm::SmallString<128> scratch;
llvm::SmallString<128> currPath;
isFramework = false;
for (auto path : ctx.SearchPathOpts.ImportSearchPaths) {
auto err = openModuleFiles(path, moduleFilename.str(),
moduleDocFilename.str(), moduleBuffer,
moduleDocBuffer, scratch);
auto err = openModuleFiles(path,
moduleFilename.str(), moduleDocFilename.str(),
moduleBuffer, moduleDocBuffer,
scratch);
if (err.value() == llvm::errc::is_a_directory) {
currPath = path;
llvm::sys::path::append(currPath, moduleFilename.str());
err = openModuleFiles(currPath,
archFile.str(), archDocFile.str(),
moduleBuffer, moduleDocBuffer,
scratch);
}
if (!err || err.value() != llvm::errc::no_such_file_or_directory)
return err;
}
@@ -89,26 +111,14 @@ findModule(ASTContext &ctx, AccessPathElem moduleID,
moduleFramework += ".framework";
isFramework = true;
// FIXME: Which name should we be using here? Do we care about CPU subtypes?
// FIXME: At the very least, don't hardcode "arch".
llvm::SmallString<16> archFile(ctx.LangOpts.getTargetConfigOption("arch"));
llvm::SmallString<16> archDocFile(ctx.LangOpts.getTargetConfigOption("arch"));
if (!archFile.empty()) {
archFile += '.';
archFile += SERIALIZED_MODULE_EXTENSION;
archDocFile += '.';
archDocFile += SERIALIZED_MODULE_DOC_EXTENSION;
}
llvm::SmallString<128> currPath;
for (auto path : ctx.SearchPathOpts.FrameworkSearchPaths) {
currPath.clear();
llvm::sys::path::append(currPath, path, moduleFramework.str(),
currPath = path;
llvm::sys::path::append(currPath, moduleFramework.str(),
"Modules", moduleFilename.str());
auto err = openModuleFiles(currPath, archFile.str(),
archDocFile.str(), moduleBuffer,
moduleDocBuffer, scratch);
auto err = openModuleFiles(currPath,
archFile.str(), archDocFile.str(),
moduleBuffer, moduleDocBuffer,
scratch);
if (!err || err.value() != llvm::errc::no_such_file_or_directory)
return err;
}