Revert r342019, "Track definition merging on the canonical declaration

even when [...]"

Further testing has revealed that this causes build breaks during
explicit module compilations.

llvm-svn: 342020

1 files changed, 0 insertions, 34 deletions

diff --git a/clang/test/Modules/merge-template-pattern-visibility-3.cpp b/clang/test/Modules/merge-template-pattern-visibility-3.cpp
deleted file mode 100644
index 9ac1b6699da..00000000000
--- a/clang/test/Modules/merge-template-pattern-visibility-3.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// RUN: %clang_cc1 -fmodules -emit-llvm-only %s -verify
-
-#pragma clang module build A
-module A {}
-#pragma clang module contents
-#pragma clang module begin A
-template<typename T> void f(const T&) { T::error; }
-#pragma clang module end
-#pragma clang module endbuild
-
-#pragma clang module build B
-module B {}
-#pragma clang module contents
-#pragma clang module begin B
-template<typename T> void f(const T&) { T::error; }
-#pragma clang module end
-#pragma clang module endbuild
-
-#pragma clang module build C
-module C {}
-#pragma clang module contents
-#pragma clang module begin C
-#pragma clang module load B
-template<typename T> void f(const T&) { T::error; }
-#pragma clang module end
-#pragma clang module endbuild
-
-#pragma clang module load A
-inline void f() {}
-void x() { f(); }
-
-#pragma clang module import C
-// expected-error@* {{cannot be used prior to}}
-void y(int n) { f(n); } // expected-note {{instantiation of}}