When making a module visible, also make any of its exported modules
visible, allowing one to create modules that import (and then
re-export) other modules.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145696 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 26fca22..76bc0b8 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -2504,6 +2504,18 @@
if (!Sub->getValue()->IsExplicit && Visited.insert(Sub->getValue()))
Stack.push_back(Sub->getValue());
}
+
+ // Push any exported modules onto the stack to be marked as visible.
+ for (unsigned I = 0, N = Mod->Exports.size(); I != N; ++I) {
+ Module *Exported = Mod->Exports[I].getPointer();
+ if (Visited.insert(Exported)) {
+ // FIXME: The intent of wildcards is to re-export any imported modules.
+ // However, we don't yet have the module-dependency information to do
+ // this, so we ignore wildcards for now.
+ if (!Mod->Exports[I].getInt())
+ Stack.push_back(Exported);
+ }
+ }
}
}
diff --git a/test/Modules/diamond.c b/test/Modules/diamond.c
index 93722e9..59181c5 100644
--- a/test/Modules/diamond.c
+++ b/test/Modules/diamond.c
@@ -5,12 +5,6 @@
__import_module__ diamond_bottom;
-// FIXME: We want 'bottom' to re-export left and right, and both of those to
-// re-export 'top'.
-__import_module__ diamond_top;
-__import_module__ diamond_left;
-__import_module__ diamond_right;
-
void test_diamond(int i, float f, double d, char c) {
top(&i);
left(&f);