[modules] Treat friend declarations that are lexically within a dependent
authorRichard Smith <richard-llvm@metafoo.co.uk>
Sat, 7 Feb 2015 03:11:11 +0000 (03:11 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Sat, 7 Feb 2015 03:11:11 +0000 (03:11 +0000)
commit2b5605751786a85f05da3b0a344aa832e582080f
tree6cc85ab594945f87cf525e7a5bbddff1b005d976
parent635c2c4378c0ad112899810cb39248d4cc95e0cb
[modules] Treat friend declarations that are lexically within a dependent
context as anonymous for merging purposes. They can't be found by their names,
so we merge them based on their position within the surrounding context.

llvm-svn: 228485
12 files changed:
clang/lib/AST/DeclBase.cpp
clang/lib/Serialization/ASTCommon.cpp
clang/lib/Serialization/ASTCommon.h
clang/lib/Serialization/ASTReaderDecl.cpp
clang/lib/Serialization/ASTWriter.cpp
clang/lib/Serialization/ASTWriterDecl.cpp
clang/test/Modules/Inputs/merge-dependent-friends/a.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-dependent-friends/b.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-dependent-friends/c.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-dependent-friends/d.h [new file with mode: 0644]
clang/test/Modules/Inputs/merge-dependent-friends/module.modulemap [new file with mode: 0644]
clang/test/Modules/merge-dependent-friends.cpp [new file with mode: 0644]