This is an automated email from the git hooks/post-receive script.

unknown user pushed a change to branch master in repository clang.

from 8b92e51e54 [NFC] Fix build breakage caused by D51948 new eba34ceb25 Fix tracking of merged definitions when the merge target is [...] new a2e7966958 Consistently create a new declaration when merging a pre-exi [...] new 78f85fba22 Track definition merging on the canonical declaration even w [...]

The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.

Summary of changes: include/clang/AST/ASTContext.h | 3 +- include/clang/Sema/Sema.h | 5 +- lib/AST/ASTContext.cpp | 7 +- lib/AST/ASTDumper.cpp | 9 +++ lib/Sema/SemaDecl.cpp | 16 ++-- lib/Sema/SemaDeclCXX.cpp | 3 +- lib/Sema/SemaLookup.cpp | 90 +++++++++++----------- lib/Sema/SemaTemplate.cpp | 59 +++++++++----- lib/Sema/SemaTemplateInstantiateDecl.cpp | 2 +- lib/Sema/SemaType.cpp | 25 +++++- lib/Serialization/ASTReader.cpp | 9 +-- lib/Serialization/ASTReaderDecl.cpp | 17 +--- .../merge-template-pattern-visibility-2.cpp | 34 ++++++++ ...cpp => merge-template-pattern-visibility-3.cpp} | 27 +++---- test/Modules/submodules-merge-defs.cpp | 2 +- 15 files changed, 185 insertions(+), 123 deletions(-) create mode 100644 test/Modules/merge-template-pattern-visibility-2.cpp copy test/Modules/{friend-definition.cpp => merge-template-pattern-visibility-3.cp [...]