summaryrefslogtreecommitdiffstats
path: root/clang/lib/Serialization/ASTReaderDecl.cpp
diff options
context:
space:
mode:
authorStephan Tolksdorf <st@quanttec.com>2014-03-27 19:22:19 +0000
committerStephan Tolksdorf <st@quanttec.com>2014-03-27 19:22:19 +0000
commita6a0863470796a0e01fed0273811192cb1a6a455 (patch)
tree6279b2c6af084a5f6d9fa04229a6e1b05172acfb /clang/lib/Serialization/ASTReaderDecl.cpp
parent1f9d80ac666e3e96540871070fbe20758a73c708 (diff)
downloadbcm5719-llvm-a6a0863470796a0e01fed0273811192cb1a6a455.tar.gz
bcm5719-llvm-a6a0863470796a0e01fed0273811192cb1a6a455.zip
Fix PR18307: Properly (de)serialize inherited constructors and their using declarations
Reviewed in http://llvm-reviews.chandlerc.com/D3102 llvm-svn: 204951
Diffstat (limited to 'clang/lib/Serialization/ASTReaderDecl.cpp')
-rw-r--r--clang/lib/Serialization/ASTReaderDecl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp
index f266ebaa98e..7d950729304 100644
--- a/clang/lib/Serialization/ASTReaderDecl.cpp
+++ b/clang/lib/Serialization/ASTReaderDecl.cpp
@@ -1348,7 +1348,9 @@ void ASTDeclReader::VisitCXXMethodDecl(CXXMethodDecl *D) {
void ASTDeclReader::VisitCXXConstructorDecl(CXXConstructorDecl *D) {
VisitCXXMethodDecl(D);
-
+
+ if (auto *CD = ReadDeclAs<CXXConstructorDecl>(Record, Idx))
+ D->setInheritedConstructor(CD);
D->IsExplicitSpecified = Record[Idx++];
std::tie(D->CtorInitializers, D->NumCtorInitializers) =
Reader.ReadCXXCtorInitializers(F, Record, Idx);
OpenPOWER on IntegriCloud