diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-10-05 00:47:24 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-10-05 00:47:24 +0000 |
commit | b80e7533bfb0dfd117d45596ed983b008a1e7b85 (patch) | |
tree | 1458ad266545fa58dd02202af50be1d488ace5ac /clang/lib/Serialization/ASTReaderDecl.cpp | |
parent | 3ea492ad74050d6c4afe6aa00abcc4151def4214 (diff) | |
download | bcm5719-llvm-b80e7533bfb0dfd117d45596ed983b008a1e7b85.tar.gz bcm5719-llvm-b80e7533bfb0dfd117d45596ed983b008a1e7b85.zip |
PR33924: Merge block-scope anonymous declarations if there are multiple definitions of the enclosing function.
llvm-svn: 314956
Diffstat (limited to 'clang/lib/Serialization/ASTReaderDecl.cpp')
-rw-r--r-- | clang/lib/Serialization/ASTReaderDecl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index 57f509ea6f6..118417c9305 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -467,6 +467,7 @@ FunctionDecl *ASTDeclReader::TryRegisterAsFunctionDefinition(FunctionDecl *D) { // declaration. if (Definition != D) { // Already have a different definition, merge this one into it. + Reader.MergedDeclContexts.insert(std::make_pair(D, Definition)); Reader.mergeDefinitionVisibility(Definition, D); } return Definition; |