diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-10-13 23:04:14 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-10-13 23:04:14 +0000 |
| commit | b50df911788541fb5e17fe7cf3ce25330101a53a (patch) | |
| tree | 5dfbd3ed0b7015b114563b7e54ae820b75cbfd36 /clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h | |
| parent | 7705c4f1be36d8c3384f71b71fdd6751a49d7a70 (diff) | |
| download | bcm5719-llvm-b50df911788541fb5e17fe7cf3ce25330101a53a.tar.gz bcm5719-llvm-b50df911788541fb5e17fe7cf3ce25330101a53a.zip | |
Reinstate r281429, reverted in r281452, with a fix for its mishandling of
compiles without -fmodules-local-submodule-visibility. Original commit message:
[modules] When merging one definition into another, propagate the list of
re-exporting modules from the discarded definition to the retained definition.
llvm-svn: 284176
Diffstat (limited to 'clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h')
| -rw-r--r-- | clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h | 3 |
1 files changed, 3 insertions, 0 deletions
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..01594bb4b89 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,8 @@ 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 {}; } |
