diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-09-14 01:05:35 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-09-14 01:05:35 +0000 |
| commit | 1c16d1b576bc215fa116a025efa4fca7090d6b5c (patch) | |
| tree | 0b3ca31d483da069d69bf85f2956caa072d26710 /clang/test | |
| parent | 5085710892a0284899044c143d299fbaa726ffc9 (diff) | |
| download | bcm5719-llvm-1c16d1b576bc215fa116a025efa4fca7090d6b5c.tar.gz bcm5719-llvm-1c16d1b576bc215fa116a025efa4fca7090d6b5c.zip | |
[modules] When merging one definition into another, propagate the list of
re-exporting modules from the discarded definition to the retained definition.
llvm-svn: 281429
Diffstat (limited to 'clang/test')
4 files changed, 11 insertions, 0 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 e6592027611..7225110a377 100644 --- a/clang/test/Modules/Inputs/merge-template-pattern-visibility/a.h +++ b/clang/test/Modules/Inputs/merge-template-pattern-visibility/a.h @@ -4,3 +4,7 @@ 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 41b52d5e6ab..7301ca722dd 100644 --- a/clang/test/Modules/Inputs/merge-template-pattern-visibility/b.h +++ b/clang/test/Modules/Inputs/merge-template-pattern-visibility/b.h @@ -17,4 +17,6 @@ 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 db80eda1ea6..68957dbad07 100644 --- a/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h +++ b/clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h @@ -5,5 +5,7 @@ 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 ec5aa26c68d..4cfac176c05 100644 --- a/clang/test/Modules/merge-template-pattern-visibility.cpp +++ b/clang/test/Modules/merge-template-pattern-visibility.cpp @@ -7,6 +7,8 @@ // 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" @@ -15,4 +17,5 @@ void g() { CrossModuleMerge::B<int> bi; CrossModuleMerge::C(0); + CrossModuleMerge::D(0); } |
