[modules] Don't try to merge template specializations by performing name lookup
authorRichard Smith <richard-llvm@metafoo.co.uk>
Fri, 11 Jul 2014 00:20:06 +0000 (00:20 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Fri, 11 Jul 2014 00:20:06 +0000 (00:20 +0000)
commitdc5523d38fc12d167d83b8d4732a78fbf9be70b4
treee45ad19f76dc62e7ea3db850a6d8e01c10d0d6d0
parent7660d653c8173f9586a2e8a5a4f9e2516de7ca7c
[modules] Don't try to merge template specializations by performing name lookup
into their container; we won't find them there. These things are already being
merged when they're added to their primary template's folding set, so this
merging is redundant (and causes us to reject-valid because we think we've
found an odr violation).

llvm-svn: 212788
clang/lib/Serialization/ASTReaderDecl.cpp
clang/test/Modules/Inputs/cxx-templates-a.h
clang/test/Modules/Inputs/cxx-templates-b.h
clang/test/Modules/Inputs/cxx-templates-common.h
clang/test/Modules/cxx-templates.cpp