From: Craig Topper Date: Fri, 25 Dec 2015 00:36:02 +0000 (+0000) Subject: Revert r256399 "[Sema] ArrayRef-ize ActOnBaseSpecifiers. NFC" X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cde3c8b572ce20e249a73c9348d7e41c59433731;p=clang Revert r256399 "[Sema] ArrayRef-ize ActOnBaseSpecifiers. NFC" It broke lldb build. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@256403 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h index 29bdce8128..1c54e1bb62 100644 --- a/include/clang/AST/DeclCXX.h +++ b/include/clang/AST/DeclCXX.h @@ -701,7 +701,7 @@ public: } /// \brief Sets the base classes of this struct or class. - void setBases(ArrayRef Bases); + void setBases(CXXBaseSpecifier const * const *Bases, unsigned NumBases); /// \brief Retrieves the number of base classes of this class. unsigned getNumBases() const { return data().NumBases; } diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index 19858938c9..06c436acd2 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -5365,10 +5365,10 @@ public: SourceLocation BaseLoc, SourceLocation EllipsisLoc); - bool AttachBaseSpecifiers(CXXRecordDecl *Class, - MutableArrayRef Bases); - void ActOnBaseSpecifiers(Decl *ClassDecl, - MutableArrayRef Bases); + bool AttachBaseSpecifiers(CXXRecordDecl *Class, CXXBaseSpecifier **Bases, + unsigned NumBases); + void ActOnBaseSpecifiers(Decl *ClassDecl, CXXBaseSpecifier **Bases, + unsigned NumBases); bool IsDerivedFrom(SourceLocation Loc, QualType Derived, QualType Base); bool IsDerivedFrom(SourceLocation Loc, QualType Derived, QualType Base, diff --git a/lib/AST/ASTImporter.cpp b/lib/AST/ASTImporter.cpp index 36a41cd7be..824cc18010 100644 --- a/lib/AST/ASTImporter.cpp +++ b/lib/AST/ASTImporter.cpp @@ -2073,7 +2073,7 @@ bool ASTNodeImporter::ImportDefinition(RecordDecl *From, RecordDecl *To, EllipsisLoc)); } if (!Bases.empty()) - ToCXX->setBases(Bases); + ToCXX->setBases(Bases.data(), Bases.size()); } if (shouldForceImportDeclContext(Kind)) diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index 22b485a904..32e64b6e4e 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -135,13 +135,14 @@ CXXRecordDecl::CreateDeserialized(const ASTContext &C, unsigned ID) { } void -CXXRecordDecl::setBases(ArrayRef Bases) { +CXXRecordDecl::setBases(CXXBaseSpecifier const * const *Bases, + unsigned NumBases) { ASTContext &C = getASTContext(); if (!data().Bases.isOffset() && data().NumBases > 0) C.Deallocate(data().getBases()); - if (!Bases.empty()) { + if (NumBases) { // C++ [dcl.init.aggr]p1: // An aggregate is [...] a class with [...] no base classes [...]. data().Aggregate = false; @@ -157,9 +158,9 @@ CXXRecordDecl::setBases(ArrayRef Bases) { // The virtual bases of this class. SmallVector VBases; - data().Bases = new(C) CXXBaseSpecifier [Bases.size()]; - data().NumBases = Bases.size(); - for (unsigned i = 0; i < Bases.size(); ++i) { + data().Bases = new(C) CXXBaseSpecifier [NumBases]; + data().NumBases = NumBases; + for (unsigned i = 0; i < NumBases; ++i) { data().getBases()[i] = *Bases[i]; // Keep track of inherited vbases for this base class. const CXXBaseSpecifier *Base = Bases[i]; diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index a4de9751f9..2768fc055e 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -1844,7 +1844,7 @@ void Parser::ParseBaseClause(Decl *ClassDecl) { } // Attach the base specifiers - Actions.ActOnBaseSpecifiers(ClassDecl, BaseInfo); + Actions.ActOnBaseSpecifiers(ClassDecl, BaseInfo.data(), BaseInfo.size()); } /// ParseBaseSpecifier - Parse a C++ base-specifier. A base-specifier is diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 6fbfd8202f..f67e573c74 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -1553,9 +1553,9 @@ NoteIndirectBases(ASTContext &Context, IndirectBaseSet &Set, /// \brief Performs the actual work of attaching the given base class /// specifiers to a C++ class. -bool Sema::AttachBaseSpecifiers(CXXRecordDecl *Class, - MutableArrayRef Bases) { - if (Bases.empty()) +bool Sema::AttachBaseSpecifiers(CXXRecordDecl *Class, CXXBaseSpecifier **Bases, + unsigned NumBases) { + if (NumBases == 0) return false; // Used to keep track of which base types we have already seen, so @@ -1571,7 +1571,7 @@ bool Sema::AttachBaseSpecifiers(CXXRecordDecl *Class, // Copy non-redundant base specifiers into permanent storage. unsigned NumGoodBases = 0; bool Invalid = false; - for (unsigned idx = 0; idx < Bases.size(); ++idx) { + for (unsigned idx = 0; idx < NumBases; ++idx) { QualType NewBaseType = Context.getCanonicalType(Bases[idx]->getType()); NewBaseType = NewBaseType.getLocalUnqualifiedType(); @@ -1597,7 +1597,7 @@ bool Sema::AttachBaseSpecifiers(CXXRecordDecl *Class, Bases[NumGoodBases++] = Bases[idx]; // Note this base's direct & indirect bases, if there could be ambiguity. - if (Bases.size() > 1) + if (NumBases > 1) NoteIndirectBases(Context, IndirectBaseTypes, NewBaseType); if (const RecordType *Record = NewBaseType->getAs()) { @@ -1619,7 +1619,7 @@ bool Sema::AttachBaseSpecifiers(CXXRecordDecl *Class, } // Attach the remaining base class specifiers to the derived class. - Class->setBases(Bases.slice(0, NumGoodBases)); + Class->setBases(Bases, NumGoodBases); for (unsigned idx = 0; idx < NumGoodBases; ++idx) { // Check whether this direct base is inaccessible due to ambiguity. @@ -1654,13 +1654,13 @@ bool Sema::AttachBaseSpecifiers(CXXRecordDecl *Class, /// ActOnBaseSpecifiers - Attach the given base specifiers to the /// class, after checking whether there are any duplicate base /// classes. -void Sema::ActOnBaseSpecifiers(Decl *ClassDecl, - MutableArrayRef Bases) { - if (!ClassDecl || Bases.empty()) +void Sema::ActOnBaseSpecifiers(Decl *ClassDecl, CXXBaseSpecifier **Bases, + unsigned NumBases) { + if (!ClassDecl || !Bases || !NumBases) return; AdjustDeclIfTemplate(ClassDecl); - AttachBaseSpecifiers(cast(ClassDecl), Bases); + AttachBaseSpecifiers(cast(ClassDecl), Bases, NumBases); } /// \brief Determine whether the type \p Derived is a C++ class that is diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp index fb7fc109d2..739f96d37f 100644 --- a/lib/Sema/SemaTemplateInstantiate.cpp +++ b/lib/Sema/SemaTemplateInstantiate.cpp @@ -1837,7 +1837,9 @@ Sema::SubstBaseSpecifiers(CXXRecordDecl *Instantiation, Invalid = true; } - if (!Invalid && AttachBaseSpecifiers(Instantiation, InstantiatedBases)) + if (!Invalid && + AttachBaseSpecifiers(Instantiation, InstantiatedBases.data(), + InstantiatedBases.size())) Invalid = true; return Invalid;