[modules] Fix some of the confusion when computing the override set for a macro

introduced by finalization. This is still not entirely correct; more fixes to
follow.

llvm-svn: 213498

3 files changed, 7 insertions, 0 deletions

diff --git a/clang/test/Modules/Inputs/macro-hiding/e1.h b/clang/test/Modules/Inputs/macro-hiding/e1.h
new file mode 100644
index 00000000000..bd01708c5e3
--- /dev/null
+++ b/clang/test/Modules/Inputs/macro-hiding/e1.h
@@ -0,0 +1 @@
+#include "a1.h"
diff --git a/clang/test/Modules/Inputs/macro-hiding/e2.h b/clang/test/Modules/Inputs/macro-hiding/e2.h
new file mode 100644
index 00000000000..f3a49c70aea
--- /dev/null
+++ b/clang/test/Modules/Inputs/macro-hiding/e2.h
@@ -0,0 +1,2 @@
+#include "a1.h"
+inline void e1() { assert(true); }
diff --git a/clang/test/Modules/Inputs/macro-hiding/module.modulemap b/clang/test/Modules/Inputs/macro-hiding/module.modulemap
index 14ca9af86ab..20632d35aeb 100644
--- a/clang/test/Modules/Inputs/macro-hiding/module.modulemap
+++ b/clang/test/Modules/Inputs/macro-hiding/module.modulemap
@@ -12,3 +12,7 @@ module c {
 module d {
   module d1 { header "d1.h" export * }
 }
+module e {
+  module e1 { header "e1.h" export * }
+  module e2 { header "e2.h" export * }
+}