diff options
| author | Eric Liu <ioeric@google.com> | 2016-09-14 10:05:10 +0000 |
|---|---|---|
| committer | Eric Liu <ioeric@google.com> | 2016-09-14 10:05:10 +0000 |
| commit | 762b4887c23edfd0bcb02471ae573f73e5a53c4b (patch) | |
| tree | e08b81dc2f8321a1085727cace7375ac8b6765fc /clang/test/Modules | |
| parent | 9790d8f81d3d8a8a90040be70a3a897a343f6ed9 (diff) | |
| download | bcm5719-llvm-762b4887c23edfd0bcb02471ae573f73e5a53c4b.tar.gz bcm5719-llvm-762b4887c23edfd0bcb02471ae573f73e5a53c4b.zip | |
Revert "[modules] When merging one definition into another, propagate the list of re-exporting modules from the discarded definition to the retained definition."
This reverts commit r281429.
llvm-svn: 281452
Diffstat (limited to 'clang/test/Modules')
4 files changed, 0 insertions, 11 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 7225110a377..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,7 +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) {} -} 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 7301ca722dd..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,6 +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) {} } 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 68957dbad07..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,7 +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) {} } diff --git a/clang/test/Modules/merge-template-pattern-visibility.cpp b/clang/test/Modules/merge-template-pattern-visibility.cpp index 4cfac176c05..ec5aa26c68d 100644 --- a/clang/test/Modules/merge-template-pattern-visibility.cpp +++ b/clang/test/Modules/merge-template-pattern-visibility.cpp @@ -7,8 +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 #include "b.h" #include "d.h" @@ -17,5 +15,4 @@ void g() { CrossModuleMerge::B<int> bi; CrossModuleMerge::C(0); - CrossModuleMerge::D(0); } |
