[modules] It's possible to merge into the pattern of a class template before we
authorRichard Smith <richard-llvm@metafoo.co.uk>
Thu, 22 Jan 2015 01:41:56 +0000 (01:41 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Thu, 22 Jan 2015 01:41:56 +0000 (01:41 +0000)
commit5156c3857066396e744137cdadf94fb18fa29da2
treeafcc4c56db5547c8bd452d99b338bb50e81f8b55
parent1d59f99f5c1c28035bd5fa35626d5813dc2b0500
[modules] It's possible to merge into the pattern of a class template before we
load the definition data from the declaration itself. In that case, merge
properly; don't assume the prior definition is the same as our own.

llvm-svn: 226761
clang/lib/Serialization/ASTReaderDecl.cpp
clang/test/Modules/Inputs/merge-anon-in-template/a.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-anon-in-template/b.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-anon-in-template/c.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-anon-in-template/module.modulemap [new file with mode: 0644]
clang/test/Modules/merge-anon-in-template.cc [new file with mode: 0644]