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 remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2018-05-04 13:09:41 -07:00
parent d7a42d4cd0 76ef2768b6
commit 289829000b
33 changed files with 136 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Serialization/ModuleFile.cpp
View File

@@ -1148,12 +1148,10 @@ ModuleFile::ModuleFile(
unsigned kind = cursor.readRecord(next.ID, scratch, &blobData);
switch (kind) {
case input_block::IMPORTED_MODULE: {
bool exported, usableFromInline, scoped;
bool exported, scoped;
input_block::ImportedModuleLayout::readRecord(scratch,
exported,
usableFromInline,
scoped);
Dependencies.push_back({blobData, exported, usableFromInline, scoped});
exported, scoped);
Dependencies.push_back({blobData, exported, scoped});
break;
}
case input_block::LINK_LIBRARY: {
@@ -1615,13 +1613,6 @@ void ModuleFile::getImportedModules(
continue;
break;
case ModuleDecl::ImportFilter::ForLinking:
// Only include @_exported and @usableFromInline imports.
if (!dep.isExported() && !dep.isUsableFromInline())
continue;
break;
}
assert(dep.isLoaded());
@@ -1690,9 +1681,6 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
if (Dep.isExported())
ID->getAttrs().add(
new (Ctx) ExportedAttr(/*IsImplicit=*/false));
if (Dep.isUsableFromInline())
ID->getAttrs().add(
new (Ctx) UsableFromInlineImportAttr(/*IsImplicit=*/true));
ImportDecls.push_back(ID);
}
Bits.ComputedImportDecls = true;