[modules] When merging the pattern of a class template definition into a prior
authorRichard Smith <richard-llvm@metafoo.co.uk>
Wed, 11 Mar 2015 18:21:02 +0000 (18:21 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Wed, 11 Mar 2015 18:21:02 +0000 (18:21 +0000)
commit7474dd92d3b8be5723fea9d5f13a61e6d94f4466
treeb3ab9daafaf0cec033485f634fb0b52ac013c192
parentbac75698d4860ae32e6e1acdd29cff44efa60fb1
[modules] When merging the pattern of a class template definition into a prior
definition, be sure to update the definition data on all declarations, not just
the canonical one, since the pattern might not be in the list of pending
definitions (if it used to be canonical itself).

One-line fix by me; reduced testcase by Daniel Jasper!

llvm-svn: 231950
clang/lib/Serialization/ASTReaderDecl.cpp
clang/test/Modules/Inputs/merge-template-friend/def.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-template-friend/friend.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-template-friend/module.modulemap [new file with mode: 0644]
clang/test/Modules/merge-template-friend.cpp [new file with mode: 0644]