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

[IDE] Make sure the import decls for swift modules from the generated interface have the module assigned to them.

Browse Source 
Swift SVN r23723
This commit is contained in:
Argyrios Kyrtzidis
2014-12-05 04:43:38 +00:00
parent bd33410e16
commit 4130a8efa3
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Serialization/ModuleFile.cpp
View File

@@ -996,6 +996,7 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
SmallVector<std::pair<swift::Identifier, swift::SourceLoc>, 1>
AccessPath;
AccessPath.push_back({ ModuleID, SourceLoc() });
Module *M = Ctx.getModule(AccessPath);
auto Kind = ImportKind::Module;
if (!ScopePath.empty()) {
@@ -1003,7 +1004,6 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
assert(!ScopeID.empty() &&
"invalid decl name (non-top-level decls not supported)");
Module *M = Ctx.getModule(AccessPath);
if (!M) {
// The dependency module could not be loaded. Just make a guess
// about the import kind, we can not do better.
@@ -1024,6 +1024,7 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
auto *ID = ImportDecl::create(Ctx, FileContext, SourceLoc(), Kind,
SourceLoc(), AccessPath);
ID->setModule(M);
if (Dep.isExported())
ID->getAttrs().add(
new (Ctx) ExportedAttr(/*IsImplicit=*/false));