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

Load Swift modules from framework bundles.

Browse Source 
Swift can now find modules inside framework bundles matching this layout:

Foo.framework/
  Foo.swiftmodule/
    ARCH.swiftmodule

Currently, ARCH is the architecture name used by build configurations (#if),
but this was more done out of convenience than anything else (there's
currently no access to the current target from the ASTContext). We'll need
to revisit this if/when we decide to support architecture subtypes (armv7s
vs. armv7 vs. arm), at which point we'll also have to deal with fallback
architectures.

Framework search paths are specified using -F. Like bare import paths, there
are currently no "built-in framework search paths".

The master plan for Swift frameworks is in <rdar://problem/16062602>.

<rdar://problem/16155907>

Swift SVN r14363
This commit is contained in:
Jordan Rose
2014-02-26 01:12:18 +00:00
parent f40abf22da
commit 9a45a563ea
4 changed files with 77 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Serialization/ModuleFile.cpp
View File

@@ -376,12 +376,16 @@ static Optional<swift::LibraryKind> getActualLibraryKind(unsigned rawKind) {
}
ModuleFile::ModuleFile(std::unique_ptr<llvm::MemoryBuffer> input)
ModuleFile::ModuleFile(std::unique_ptr<llvm::MemoryBuffer> input,
bool isFramework)
: FileContext(nullptr),
InputFile(std::move(input)),
InputReader(reinterpret_cast<const uint8_t *>(InputFile->getBufferStart()),
reinterpret_cast<const uint8_t *>(InputFile->getBufferEnd())),
Status(ModuleStatus::Valid) {
Bits() {
assert(getStatus() == ModuleStatus::Valid);
Bits.IsFramework = isFramework;
PrettyModuleFileDeserialization stackEntry(*this);
llvm::BitstreamCursor cursor{InputReader};
@@ -573,7 +577,7 @@ ModuleFile::ModuleFile(std::unique_ptr<llvm::MemoryBuffer> input)
bool ModuleFile::associateWithFileContext(FileUnit *file) {
PrettyModuleFileDeserialization stackEntry(*this);
assert(Status == ModuleStatus::Valid && "invalid module file");
assert(getStatus() == ModuleStatus::Valid && "invalid module file");
assert(!FileContext && "already associated with an AST module");
FileContext = file;
@@ -618,7 +622,7 @@ bool ModuleFile::associateWithFileContext(FileUnit *file) {
return false;
}
return Status == ModuleStatus::Valid;
return getStatus() == ModuleStatus::Valid;
}
ModuleFile::~ModuleFile() = default;
@@ -685,7 +689,7 @@ void ModuleFile::getImportedModules(
}
void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
if (!ComputedImportDecls) {
if (!Bits.ComputedImportDecls) {
ASTContext &Ctx = getContext();
for (auto &Dep : Dependencies) {
StringRef ModulePath, ScopePath;
@@ -730,7 +734,7 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
Ctx, FileContext, SourceLoc(), Kind, SourceLoc(), Dep.IsExported,
AccessPath));
}
ComputedImportDecls = true;
Bits.ComputedImportDecls = true;
}
Results.append(ImportDecls.begin(), ImportDecls.end());
}
@@ -855,6 +859,9 @@ void
ModuleFile::collectLinkLibraries(Module::LinkLibraryCallback callback) const {
for (auto &lib : LinkLibraries)
callback(lib);
if (Bits.IsFramework)
callback(LinkLibrary(FileContext->getParentModule()->Name.str(),
LibraryKind::Framework));
}
void ModuleFile::getTopLevelDecls(SmallVectorImpl<Decl *> &results) {