Revert "Reinstate r281429, reverted in r281452, with a fix for its mishandling of"

This reverts commit r284176. It still marks some modules as invisible
that should be visible. Will follow up with the author with a test case.

llvm-svn: 284382

10 files changed, 1 insertions, 53 deletions

diff --git a/clang/test/Modules/Inputs/merge-template-pattern-visibility/a.h b/clang/test/Modules/Inputs/merge-template-pattern-visibility/a.h
index b960ba6f573..e6592027611 100644
--- a/clang/test/Modules/Inputs/merge-template-pattern-visibility/a.h
+++ b/clang/test/Modules/Inputs/merge-template-pattern-visibility/a.h
@@ -4,8 +4,3 @@ template<typename T> struct B;
 template<typename, typename> struct A {};
 template<typename T> struct B : A<T> {};
 template<typename T> inline auto C(T) {}
-
-namespace CrossModuleMerge {
-  template<typename T> inline auto D(T) {}
-  struct E {};
-}
diff --git a/clang/test/Modules/Inputs/merge-template-pattern-visibility/b.h b/clang/test/Modules/Inputs/merge-template-pattern-visibility/b.h
index 260b6b318ef..41b52d5e6ab 100644
--- a/clang/test/Modules/Inputs/merge-template-pattern-visibility/b.h
+++ b/clang/test/Modules/Inputs/merge-template-pattern-visibility/b.h
@@ -17,7 +17,4 @@ namespace CrossModuleMerge {
   template<typename, typename> struct A {};
   template<typename T> struct B : A<T> {};
   template<typename T> inline auto C(T) {}
-
-  template<typename T> inline auto D(T) {}
-  struct E;
 }
diff --git a/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h b/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h
index 01594bb4b89..db80eda1ea6 100644
--- a/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h
+++ b/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h
@@ -5,8 +5,5 @@ namespace CrossModuleMerge {
   template<typename, typename> struct A {};
   template<typename T> struct B : A<T> {};
   template<typename T> inline auto C(T) {}
-
-  template<typename T> inline auto D(T) {}
-  struct E {};
 }
 
diff --git a/clang/test/Modules/Inputs/merge-template-pattern-visibility/d.h b/clang/test/Modules/Inputs/merge-template-pattern-visibility/d.h
index 7bbd01ebce4..464f0f5bbed 100644
--- a/clang/test/Modules/Inputs/merge-template-pattern-visibility/d.h
+++ b/clang/test/Modules/Inputs/merge-template-pattern-visibility/d.h
@@ -1,3 +1 @@
-namespace CrossModuleMerge {
-  struct E {};
-}
+// d.h: empty
diff --git a/clang/test/Modules/Inputs/merge-var-template-def/a.h b/clang/test/Modules/Inputs/merge-var-template-def/a.h
deleted file mode 100644
index cce887530d7..00000000000
--- a/clang/test/Modules/Inputs/merge-var-template-def/a.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef A_H
-#define A_H
-template<typename T> struct A { static bool b; };
-template<typename T> bool A<T>::b = false;
-template<typename T> void *get() { return &(A<T>::b); }
-#endif
diff --git a/clang/test/Modules/Inputs/merge-var-template-def/b1.h b/clang/test/Modules/Inputs/merge-var-template-def/b1.h
deleted file mode 100644
index 1ef89746f72..00000000000
--- a/clang/test/Modules/Inputs/merge-var-template-def/b1.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef B1_H
-#define B1_H
-template<typename T> struct A { static bool b; };
-template<typename T> bool A<T>::b = false;
-template<typename T> void *get() { return &(A<T>::b); }
-#include "a.h"
-#endif
diff --git a/clang/test/Modules/Inputs/merge-var-template-def/b2.h b/clang/test/Modules/Inputs/merge-var-template-def/b2.h
deleted file mode 100644
index 3c7e5303e65..00000000000
--- a/clang/test/Modules/Inputs/merge-var-template-def/b2.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef B2_H
-#define B2_H
-template<typename T> struct A { static bool b; };
-template<typename T> bool A<T>::b = false;
-template<typename T> void *get() { return &(A<T>::b); }
-#endif
diff --git a/clang/test/Modules/Inputs/merge-var-template-def/module.modulemap b/clang/test/Modules/Inputs/merge-var-template-def/module.modulemap
deleted file mode 100644
index b2c96bd8217..00000000000
--- a/clang/test/Modules/Inputs/merge-var-template-def/module.modulemap
+++ /dev/null
@@ -1,5 +0,0 @@
-module a { header "a.h" export * }
-module b {
-  module b1 { header "b1.h" export * }
-  module b2 { header "b2.h" export * }
-}
diff --git a/clang/test/Modules/merge-template-pattern-visibility.cpp b/clang/test/Modules/merge-template-pattern-visibility.cpp
index bb34d3b2a60..ec5aa26c68d 100644
--- a/clang/test/Modules/merge-template-pattern-visibility.cpp
+++ b/clang/test/Modules/merge-template-pattern-visibility.cpp
@@ -7,12 +7,6 @@
 // RUN:            -fmodules-local-submodule-visibility -o %t/Y.pcm
 // RUN: %clang_cc1 -fmodules -fno-modules-error-recovery -std=c++14 -fmodule-file=%t/X.pcm -fmodule-file=%t/Y.pcm \
 // RUN:            -fmodules-local-submodule-visibility -verify %s -I%S/Inputs/merge-template-pattern-visibility
-// RUN: %clang_cc1 -fmodules -fno-modules-error-recovery -std=c++14 -fmodule-file=%t/Y.pcm -fmodule-file=%t/X.pcm \
-// RUN:            -fmodules-local-submodule-visibility -verify %s -I%S/Inputs/merge-template-pattern-visibility
-// RUN: %clang_cc1 -fmodules -fno-modules-error-recovery -std=c++14 -fmodule-file=%t/X.pcm -fmodule-file=%t/Y.pcm \
-// RUN:            -verify %s -I%S/Inputs/merge-template-pattern-visibility
-// RUN: %clang_cc1 -fmodules -fno-modules-error-recovery -std=c++14 -fmodule-file=%t/Y.pcm -fmodule-file=%t/X.pcm \
-// RUN:            -verify %s -I%S/Inputs/merge-template-pattern-visibility
 
 #include "b.h"
 #include "d.h"
@@ -21,6 +15,4 @@
 void g() {
   CrossModuleMerge::B<int> bi;
   CrossModuleMerge::C(0);
-  CrossModuleMerge::D(0);
-  CrossModuleMerge::E e;
 }
diff --git a/clang/test/Modules/merge-var-template-def.cpp b/clang/test/Modules/merge-var-template-def.cpp
deleted file mode 100644
index 4d39cad3103..00000000000
--- a/clang/test/Modules/merge-var-template-def.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: rm -rf %t
-// RUN: %clang_cc1 -I%S/Inputs/merge-var-template-def -verify -fmodules -Werror=undefined-internal -fmodules-local-submodule-visibility -fmodules-cache-path=%t -fimplicit-module-maps %s
-// expected-no-diagnostics
-
-#include "b2.h"
-namespace { struct X; }
-void *x = get<X>();