diff options
Diffstat (limited to 'clang/lib/AST')
| -rw-r--r-- | clang/lib/AST/ASTImporter.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/AST/DeclCXX.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp index 3a6a3a13dab..62cc3392542 100644 --- a/clang/lib/AST/ASTImporter.cpp +++ b/clang/lib/AST/ASTImporter.cpp @@ -739,7 +739,7 @@ Decl *ASTNodeImporter::VisitRecordDecl(RecordDecl *D) { T)); } if (!Bases.empty()) - ToCXX->setBases(Importer.getToContext(), Bases.data(), Bases.size()); + ToCXX->setBases(Bases.data(), Bases.size()); } } else { ToRecord = RecordDecl::Create(Importer.getToContext(), D->getTagKind(), diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp index a519f78fc45..b0569d68015 100644 --- a/clang/lib/AST/DeclCXX.cpp +++ b/clang/lib/AST/DeclCXX.cpp @@ -71,9 +71,10 @@ void CXXRecordDecl::Destroy(ASTContext &C) { } void -CXXRecordDecl::setBases(ASTContext &C, - CXXBaseSpecifier const * const *Bases, +CXXRecordDecl::setBases(CXXBaseSpecifier const * const *Bases, unsigned NumBases) { + ASTContext &C = getASTContext(); + // C++ [dcl.init.aggr]p1: // An aggregate is an array or a class (clause 9) with [...] // no base classes [...]. |
