[modules] Fix merging of default template arguments onto friend templates.
authorRichard Smith <richard-llvm@metafoo.co.uk>
Tue, 16 Jun 2015 21:57:05 +0000 (21:57 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Tue, 16 Jun 2015 21:57:05 +0000 (21:57 +0000)
commit5293379374f46f670305a75dd3df667f04292dc9
tree464aa9dda0c64b5626ee236c0d50a3cd2e03f1e5
parent6e07e9305b1043350d576faf0b75ad6c3c547c19
[modules] Fix merging of default template arguments onto friend templates.

Previously we'd complain about redefinition of default arguments when we
instantiated a class with a friend template that inherits its default argument,
because we propagate the default template arguemnt onto the friend when we
reload the AST.

llvm-svn: 239857
clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
clang/test/Modules/Inputs/submodules-merge-defs/defs.h
clang/test/Modules/submodules-merge-defs.cpp