diff options
| author | Richard Trieu <rtrieu@google.com> | 2017-09-30 02:19:17 +0000 |
|---|---|---|
| committer | Richard Trieu <rtrieu@google.com> | 2017-09-30 02:19:17 +0000 |
| commit | e13eabe7d33956d1d9d72314e4044db904d56728 (patch) | |
| tree | 22e2bcd053aad84898481c053012eadf3f6a3b77 /clang/lib/Serialization/ASTReaderDecl.cpp | |
| parent | 305ee8e5f852e2658ea24bafc7f78fe569de7956 (diff) | |
| download | bcm5719-llvm-e13eabe7d33956d1d9d72314e4044db904d56728.tar.gz bcm5719-llvm-e13eabe7d33956d1d9d72314e4044db904d56728.zip | |
[ODRHash] Add base classes to hashing CXXRecordDecl.
llvm-svn: 314581
Diffstat (limited to 'clang/lib/Serialization/ASTReaderDecl.cpp')
| -rw-r--r-- | clang/lib/Serialization/ASTReaderDecl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index 46164a06c34..1283b006dfb 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -1755,7 +1755,8 @@ void ASTDeclReader::MergeDefinitionData( } if (DetectedOdrViolation) - Reader.PendingOdrMergeFailures[DD.Definition].push_back(MergeDD.Definition); + Reader.PendingOdrMergeFailures[DD.Definition].push_back( + {MergeDD.Definition, &MergeDD}); } void ASTDeclReader::ReadCXXRecordDefinition(CXXRecordDecl *D, bool Update) { |
