Revert r300653 and r300650. The underlying commit fixes one issue with

modules but exposes much more widespread issues. Example and more
information is on the review thread for r300650.

Original commit summary:
[modules] Properly look up the owning module for an instantiation of a merged template.

llvm-svn: 300659

1 files changed, 0 insertions, 15 deletions

diff --git a/clang/test/Modules/template-default-args.cpp b/clang/test/Modules/template-default-args.cpp
index 1d31592fd1f..9d16cbf4342 100644
--- a/clang/test/Modules/template-default-args.cpp
+++ b/clang/test/Modules/template-default-args.cpp
@@ -44,18 +44,3 @@ H<> h; // expected-error {{default argument of 'H' must be imported from module
 I<> i;
 L<> *l;
 END
-
-namespace DeferredLookup {
-  template<typename T, typename U = T> using X = U;
-  template<typename T> void f() { (void) X<T>(); }
-  template<typename T> int n = X<T>(); // expected-warning {{extension}}
-  template<typename T> struct S { X<T> xt; enum E : int; };
-  template<typename T> enum S<T>::E : int { a = X<T>() };
-
-  void test() {
-    f<int>();
-    n<int> = 1;
-    S<int> s;
-    S<int>::E e = S<int>::E::a;
-  }
-}