Reinstate r281429, reverted in r281452, with a fix for its mishandling of
authorRichard Smith <richard-llvm@metafoo.co.uk>
Thu, 13 Oct 2016 23:04:14 +0000 (23:04 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Thu, 13 Oct 2016 23:04:14 +0000 (23:04 +0000)
commitb50df911788541fb5e17fe7cf3ce25330101a53a
tree5dfbd3ed0b7015b114563b7e54ae820b75cbfd36
parent7705c4f1be36d8c3384f71b71fdd6751a49d7a70
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
13 files changed:
clang/include/clang/AST/ASTContext.h
clang/lib/AST/ASTContext.cpp
clang/lib/Serialization/ASTReader.cpp
clang/test/Modules/Inputs/merge-template-pattern-visibility/a.h
clang/test/Modules/Inputs/merge-template-pattern-visibility/b.h
clang/test/Modules/Inputs/merge-template-pattern-visibility/c.h
clang/test/Modules/Inputs/merge-template-pattern-visibility/d.h
clang/test/Modules/Inputs/merge-var-template-def/a.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-var-template-def/b1.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-var-template-def/b2.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-var-template-def/module.modulemap [new file with mode: 0644]
clang/test/Modules/merge-template-pattern-visibility.cpp
clang/test/Modules/merge-var-template-def.cpp [new file with mode: 0644]