зеркало из https://github.com/microsoft/clang-1.git
Refactoring.
- Pass around RecordDataImpl instead of the concrete RecordData so that any SmallVector can be used. - Move ASTDeclWriter::WriteCXXDefinitionData to ASTWriter::AddCXXDefinitionData. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@117236 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Argyrios Kyrtzidis
Родитель
7b90340c9c
Коммит
89eaf3af92
|
|
@ -992,6 +992,8 @@ public:
|
|||
|
||||
friend class ASTDeclReader;
|
||||
friend class ASTDeclWriter;
|
||||
friend class ASTReader;
|
||||
friend class ASTWriter;
|
||||
};
|
||||
|
||||
/// CXXMethodDecl - Represents a static or instance method of a
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ private:
|
|||
void WriteSelectors(Sema &SemaRef);
|
||||
void WriteReferencedSelectorsPool(Sema &SemaRef);
|
||||
void WriteIdentifierTable(Preprocessor &PP);
|
||||
void WriteAttributes(const AttrVec &Attrs, RecordData &Record);
|
||||
void WriteAttributes(const AttrVec &Attrs, RecordDataImpl &Record);
|
||||
void WriteDeclChangeSetBlocks();
|
||||
void WriteDeclUpdateBlock();
|
||||
void WriteDeclContextVisibleUpdate(const DeclContext *DC);
|
||||
|
|
@ -328,28 +328,28 @@ public:
|
|||
const char* isysroot);
|
||||
|
||||
/// \brief Emit a source location.
|
||||
void AddSourceLocation(SourceLocation Loc, RecordData &Record);
|
||||
void AddSourceLocation(SourceLocation Loc, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a source range.
|
||||
void AddSourceRange(SourceRange Range, RecordData &Record);
|
||||
void AddSourceRange(SourceRange Range, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit an integral value.
|
||||
void AddAPInt(const llvm::APInt &Value, RecordData &Record);
|
||||
void AddAPInt(const llvm::APInt &Value, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a signed integral value.
|
||||
void AddAPSInt(const llvm::APSInt &Value, RecordData &Record);
|
||||
void AddAPSInt(const llvm::APSInt &Value, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a floating-point value.
|
||||
void AddAPFloat(const llvm::APFloat &Value, RecordData &Record);
|
||||
void AddAPFloat(const llvm::APFloat &Value, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a reference to an identifier.
|
||||
void AddIdentifierRef(const IdentifierInfo *II, RecordData &Record);
|
||||
void AddIdentifierRef(const IdentifierInfo *II, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a Selector (which is a smart pointer reference).
|
||||
void AddSelectorRef(Selector, RecordData &Record);
|
||||
void AddSelectorRef(Selector, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a CXXTemporary.
|
||||
void AddCXXTemporary(const CXXTemporary *Temp, RecordData &Record);
|
||||
void AddCXXTemporary(const CXXTemporary *Temp, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Get the unique number used to refer to the given selector.
|
||||
serialization::SelectorID getSelectorRef(Selector Sel);
|
||||
|
|
@ -372,7 +372,7 @@ public:
|
|||
serialization::MacroID getMacroDefinitionID(MacroDefinition *MD);
|
||||
|
||||
/// \brief Emit a reference to a type.
|
||||
void AddTypeRef(QualType T, RecordData &Record);
|
||||
void AddTypeRef(QualType T, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Force a type to be emitted and get its ID.
|
||||
serialization::TypeID GetOrCreateTypeID(QualType T);
|
||||
|
|
@ -387,16 +387,16 @@ public:
|
|||
serialization::TypeIdx getTypeIdx(QualType T) const;
|
||||
|
||||
/// \brief Emits a reference to a declarator info.
|
||||
void AddTypeSourceInfo(TypeSourceInfo *TInfo, RecordData &Record);
|
||||
void AddTypeSourceInfo(TypeSourceInfo *TInfo, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emits a template argument location info.
|
||||
void AddTemplateArgumentLocInfo(TemplateArgument::ArgKind Kind,
|
||||
const TemplateArgumentLocInfo &Arg,
|
||||
RecordData &Record);
|
||||
RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emits a template argument location.
|
||||
void AddTemplateArgumentLoc(const TemplateArgumentLoc &Arg,
|
||||
RecordData &Record);
|
||||
RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a reference to a declaration.
|
||||
void AddDeclRef(const Decl *D, RecordDataImpl &Record);
|
||||
|
|
@ -409,44 +409,46 @@ public:
|
|||
serialization::DeclID getDeclID(const Decl *D);
|
||||
|
||||
/// \brief Emit a declaration name.
|
||||
void AddDeclarationName(DeclarationName Name, RecordData &Record);
|
||||
void AddDeclarationName(DeclarationName Name, RecordDataImpl &Record);
|
||||
void AddDeclarationNameLoc(const DeclarationNameLoc &DNLoc,
|
||||
DeclarationName Name, RecordData &Record);
|
||||
DeclarationName Name, RecordDataImpl &Record);
|
||||
void AddDeclarationNameInfo(const DeclarationNameInfo &NameInfo,
|
||||
RecordData &Record);
|
||||
RecordDataImpl &Record);
|
||||
|
||||
void AddQualifierInfo(const QualifierInfo &Info, RecordData &Record);
|
||||
void AddQualifierInfo(const QualifierInfo &Info, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a nested name specifier.
|
||||
void AddNestedNameSpecifier(NestedNameSpecifier *NNS, RecordData &Record);
|
||||
void AddNestedNameSpecifier(NestedNameSpecifier *NNS, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a template name.
|
||||
void AddTemplateName(TemplateName Name, RecordData &Record);
|
||||
void AddTemplateName(TemplateName Name, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a template argument.
|
||||
void AddTemplateArgument(const TemplateArgument &Arg, RecordData &Record);
|
||||
void AddTemplateArgument(const TemplateArgument &Arg, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a template parameter list.
|
||||
void AddTemplateParameterList(const TemplateParameterList *TemplateParams,
|
||||
RecordData &Record);
|
||||
RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a template argument list.
|
||||
void AddTemplateArgumentList(const TemplateArgumentList *TemplateArgs,
|
||||
RecordData &Record);
|
||||
RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a UnresolvedSet structure.
|
||||
void AddUnresolvedSet(const UnresolvedSetImpl &Set, RecordData &Record);
|
||||
void AddUnresolvedSet(const UnresolvedSetImpl &Set, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a C++ base specifier.
|
||||
void AddCXXBaseSpecifier(const CXXBaseSpecifier &Base, RecordData &Record);
|
||||
void AddCXXBaseSpecifier(const CXXBaseSpecifier &Base, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Emit a CXXBaseOrMemberInitializer array.
|
||||
void AddCXXBaseOrMemberInitializers(
|
||||
const CXXBaseOrMemberInitializer * const *BaseOrMembers,
|
||||
unsigned NumBaseOrMembers, RecordData &Record);
|
||||
unsigned NumBaseOrMembers, RecordDataImpl &Record);
|
||||
|
||||
void AddCXXDefinitionData(const CXXRecordDecl *D, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Add a string to the given record.
|
||||
void AddString(llvm::StringRef Str, RecordData &Record);
|
||||
void AddString(llvm::StringRef Str, RecordDataImpl &Record);
|
||||
|
||||
/// \brief Mark a namespace as needing an update.
|
||||
void AddUpdatedNamespace(const NamespaceDecl *NS) {
|
||||
|
|
|
|||
|
|
@ -62,7 +62,12 @@ namespace clang {
|
|||
Reader.ReadDeclarationNameInfo(F, NameInfo, R, I);
|
||||
}
|
||||
|
||||
void ReadCXXDefinitionData(struct CXXRecordDecl::DefinitionData &Data);
|
||||
void ReadCXXDefinitionData(struct CXXRecordDecl::DefinitionData &Data,
|
||||
const RecordData &R, unsigned &I);
|
||||
|
||||
void InitializeCXXDefinitionData(CXXRecordDecl *D,
|
||||
CXXRecordDecl *DefinitionDecl,
|
||||
const RecordData &Record, unsigned &Idx);
|
||||
public:
|
||||
ASTDeclReader(ASTReader &Reader, ASTReader::PerFileData &F,
|
||||
llvm::BitstreamCursor &Cursor, DeclID thisDeclID,
|
||||
|
|
@ -767,7 +772,8 @@ void ASTDeclReader::VisitUnresolvedUsingTypenameDecl(
|
|||
}
|
||||
|
||||
void ASTDeclReader::ReadCXXDefinitionData(
|
||||
struct CXXRecordDecl::DefinitionData &Data) {
|
||||
struct CXXRecordDecl::DefinitionData &Data,
|
||||
const RecordData &Record, unsigned &Idx) {
|
||||
ASTContext &C = *Reader.getContext();
|
||||
|
||||
Data.UserDeclaredConstructor = Record[Idx++];
|
||||
|
|
@ -809,16 +815,15 @@ void ASTDeclReader::ReadCXXDefinitionData(
|
|||
= cast_or_null<FriendDecl>(Reader.GetDecl(Record[Idx++]));
|
||||
}
|
||||
|
||||
void ASTDeclReader::VisitCXXRecordDecl(CXXRecordDecl *D) {
|
||||
VisitRecordDecl(D);
|
||||
|
||||
void ASTDeclReader::InitializeCXXDefinitionData(CXXRecordDecl *D,
|
||||
CXXRecordDecl *DefinitionDecl,
|
||||
const RecordData &Record,
|
||||
unsigned &Idx) {
|
||||
ASTContext &C = *Reader.getContext();
|
||||
|
||||
CXXRecordDecl *DefinitionDecl
|
||||
= cast_or_null<CXXRecordDecl>(Reader.GetDecl(Record[Idx++]));
|
||||
if (D == DefinitionDecl) {
|
||||
D->DefinitionData = new (C) struct CXXRecordDecl::DefinitionData(D);
|
||||
ReadCXXDefinitionData(*D->DefinitionData);
|
||||
ReadCXXDefinitionData(*D->DefinitionData, Record, Idx);
|
||||
// We read the definition info. Check if there are pending forward
|
||||
// references that need to point to this DefinitionData pointer.
|
||||
ASTReader::PendingForwardRefsMap::iterator
|
||||
|
|
@ -842,6 +847,16 @@ void ASTDeclReader::VisitCXXRecordDecl(CXXRecordDecl *D) {
|
|||
Reader.PendingForwardRefs[DefinitionDecl].push_back(D);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ASTDeclReader::VisitCXXRecordDecl(CXXRecordDecl *D) {
|
||||
VisitRecordDecl(D);
|
||||
|
||||
CXXRecordDecl *DefinitionDecl
|
||||
= cast_or_null<CXXRecordDecl>(Reader.GetDecl(Record[Idx++]));
|
||||
InitializeCXXDefinitionData(D, DefinitionDecl, Record, Idx);
|
||||
|
||||
ASTContext &C = *Reader.getContext();
|
||||
|
||||
enum CXXRecKind {
|
||||
CXXRecNotTemplate = 0, CXXRecTemplate, CXXRecMemberSpecialization
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include "clang/AST/Decl.h"
|
||||
#include "clang/AST/DeclContextInternals.h"
|
||||
#include "clang/AST/DeclTemplate.h"
|
||||
#include "clang/AST/DeclFriend.h"
|
||||
#include "clang/AST/Expr.h"
|
||||
#include "clang/AST/ExprCXX.h"
|
||||
#include "clang/AST/Type.h"
|
||||
|
|
@ -60,13 +61,13 @@ const T *data(const std::vector<T, Allocator> &v) {
|
|||
namespace {
|
||||
class ASTTypeWriter {
|
||||
ASTWriter &Writer;
|
||||
ASTWriter::RecordData &Record;
|
||||
ASTWriter::RecordDataImpl &Record;
|
||||
|
||||
public:
|
||||
/// \brief Type code that corresponds to the record generated.
|
||||
TypeCode Code;
|
||||
|
||||
ASTTypeWriter(ASTWriter &Writer, ASTWriter::RecordData &Record)
|
||||
ASTTypeWriter(ASTWriter &Writer, ASTWriter::RecordDataImpl &Record)
|
||||
: Writer(Writer), Record(Record), Code(TYPE_EXT_QUAL) { }
|
||||
|
||||
void VisitArrayType(const ArrayType *T);
|
||||
|
|
@ -332,10 +333,10 @@ namespace {
|
|||
|
||||
class TypeLocWriter : public TypeLocVisitor<TypeLocWriter> {
|
||||
ASTWriter &Writer;
|
||||
ASTWriter::RecordData &Record;
|
||||
ASTWriter::RecordDataImpl &Record;
|
||||
|
||||
public:
|
||||
TypeLocWriter(ASTWriter &Writer, ASTWriter::RecordData &Record)
|
||||
TypeLocWriter(ASTWriter &Writer, ASTWriter::RecordDataImpl &Record)
|
||||
: Writer(Writer), Record(Record) { }
|
||||
|
||||
#define ABSTRACT_TYPELOC(CLASS, PARENT)
|
||||
|
|
@ -507,7 +508,7 @@ void TypeLocWriter::VisitObjCObjectPointerTypeLoc(ObjCObjectPointerTypeLoc TL) {
|
|||
|
||||
static void EmitBlockID(unsigned ID, const char *Name,
|
||||
llvm::BitstreamWriter &Stream,
|
||||
ASTWriter::RecordData &Record) {
|
||||
ASTWriter::RecordDataImpl &Record) {
|
||||
Record.clear();
|
||||
Record.push_back(ID);
|
||||
Stream.EmitRecord(llvm::bitc::BLOCKINFO_CODE_SETBID, Record);
|
||||
|
|
@ -522,7 +523,7 @@ static void EmitBlockID(unsigned ID, const char *Name,
|
|||
|
||||
static void EmitRecordID(unsigned ID, const char *Name,
|
||||
llvm::BitstreamWriter &Stream,
|
||||
ASTWriter::RecordData &Record) {
|
||||
ASTWriter::RecordDataImpl &Record) {
|
||||
Record.clear();
|
||||
Record.push_back(ID);
|
||||
while (*Name)
|
||||
|
|
@ -531,7 +532,7 @@ static void EmitRecordID(unsigned ID, const char *Name,
|
|||
}
|
||||
|
||||
static void AddStmtsExprs(llvm::BitstreamWriter &Stream,
|
||||
ASTWriter::RecordData &Record) {
|
||||
ASTWriter::RecordDataImpl &Record) {
|
||||
#define RECORD(X) EmitRecordID(X, #X, Stream, Record)
|
||||
RECORD(STMT_STOP);
|
||||
RECORD(STMT_NULL_PTR);
|
||||
|
|
@ -2200,7 +2201,7 @@ void ASTWriter::WriteAdditionalTemplateSpecializations() {
|
|||
//===----------------------------------------------------------------------===//
|
||||
|
||||
/// \brief Write a record containing the given attributes.
|
||||
void ASTWriter::WriteAttributes(const AttrVec &Attrs, RecordData &Record) {
|
||||
void ASTWriter::WriteAttributes(const AttrVec &Attrs, RecordDataImpl &Record) {
|
||||
Record.push_back(Attrs.size());
|
||||
for (AttrVec::const_iterator i = Attrs.begin(), e = Attrs.end(); i != e; ++i){
|
||||
const Attr * A = *i;
|
||||
|
|
@ -2213,7 +2214,7 @@ void ASTWriter::WriteAttributes(const AttrVec &Attrs, RecordData &Record) {
|
|||
}
|
||||
}
|
||||
|
||||
void ASTWriter::AddString(llvm::StringRef Str, RecordData &Record) {
|
||||
void ASTWriter::AddString(llvm::StringRef Str, RecordDataImpl &Record) {
|
||||
Record.push_back(Str.size());
|
||||
Record.insert(Record.end(), Str.begin(), Str.end());
|
||||
}
|
||||
|
|
@ -2742,31 +2743,31 @@ void ASTWriter::WriteDeclUpdateBlock() {
|
|||
Stream.EmitRecord(DECL_REPLACEMENTS, Record);
|
||||
}
|
||||
|
||||
void ASTWriter::AddSourceLocation(SourceLocation Loc, RecordData &Record) {
|
||||
void ASTWriter::AddSourceLocation(SourceLocation Loc, RecordDataImpl &Record) {
|
||||
Record.push_back(Loc.getRawEncoding());
|
||||
}
|
||||
|
||||
void ASTWriter::AddSourceRange(SourceRange Range, RecordData &Record) {
|
||||
void ASTWriter::AddSourceRange(SourceRange Range, RecordDataImpl &Record) {
|
||||
AddSourceLocation(Range.getBegin(), Record);
|
||||
AddSourceLocation(Range.getEnd(), Record);
|
||||
}
|
||||
|
||||
void ASTWriter::AddAPInt(const llvm::APInt &Value, RecordData &Record) {
|
||||
void ASTWriter::AddAPInt(const llvm::APInt &Value, RecordDataImpl &Record) {
|
||||
Record.push_back(Value.getBitWidth());
|
||||
const uint64_t *Words = Value.getRawData();
|
||||
Record.append(Words, Words + Value.getNumWords());
|
||||
}
|
||||
|
||||
void ASTWriter::AddAPSInt(const llvm::APSInt &Value, RecordData &Record) {
|
||||
void ASTWriter::AddAPSInt(const llvm::APSInt &Value, RecordDataImpl &Record) {
|
||||
Record.push_back(Value.isUnsigned());
|
||||
AddAPInt(Value, Record);
|
||||
}
|
||||
|
||||
void ASTWriter::AddAPFloat(const llvm::APFloat &Value, RecordData &Record) {
|
||||
void ASTWriter::AddAPFloat(const llvm::APFloat &Value, RecordDataImpl &Record) {
|
||||
AddAPInt(Value.bitcastToAPInt(), Record);
|
||||
}
|
||||
|
||||
void ASTWriter::AddIdentifierRef(const IdentifierInfo *II, RecordData &Record) {
|
||||
void ASTWriter::AddIdentifierRef(const IdentifierInfo *II, RecordDataImpl &Record) {
|
||||
Record.push_back(getIdentifierRef(II));
|
||||
}
|
||||
|
||||
|
|
@ -2790,7 +2791,7 @@ MacroID ASTWriter::getMacroDefinitionID(MacroDefinition *MD) {
|
|||
return ID;
|
||||
}
|
||||
|
||||
void ASTWriter::AddSelectorRef(const Selector SelRef, RecordData &Record) {
|
||||
void ASTWriter::AddSelectorRef(const Selector SelRef, RecordDataImpl &Record) {
|
||||
Record.push_back(getSelectorRef(SelRef));
|
||||
}
|
||||
|
||||
|
|
@ -2811,13 +2812,13 @@ SelectorID ASTWriter::getSelectorRef(Selector Sel) {
|
|||
return SID;
|
||||
}
|
||||
|
||||
void ASTWriter::AddCXXTemporary(const CXXTemporary *Temp, RecordData &Record) {
|
||||
void ASTWriter::AddCXXTemporary(const CXXTemporary *Temp, RecordDataImpl &Record) {
|
||||
AddDeclRef(Temp->getDestructor(), Record);
|
||||
}
|
||||
|
||||
void ASTWriter::AddTemplateArgumentLocInfo(TemplateArgument::ArgKind Kind,
|
||||
const TemplateArgumentLocInfo &Arg,
|
||||
RecordData &Record) {
|
||||
RecordDataImpl &Record) {
|
||||
switch (Kind) {
|
||||
case TemplateArgument::Expression:
|
||||
AddStmt(Arg.getAsExpr());
|
||||
|
|
@ -2838,7 +2839,7 @@ void ASTWriter::AddTemplateArgumentLocInfo(TemplateArgument::ArgKind Kind,
|
|||
}
|
||||
|
||||
void ASTWriter::AddTemplateArgumentLoc(const TemplateArgumentLoc &Arg,
|
||||
RecordData &Record) {
|
||||
RecordDataImpl &Record) {
|
||||
AddTemplateArgument(Arg.getArgument(), Record);
|
||||
|
||||
if (Arg.getArgument().getKind() == TemplateArgument::Expression) {
|
||||
|
|
@ -2852,7 +2853,7 @@ void ASTWriter::AddTemplateArgumentLoc(const TemplateArgumentLoc &Arg,
|
|||
Record);
|
||||
}
|
||||
|
||||
void ASTWriter::AddTypeSourceInfo(TypeSourceInfo *TInfo, RecordData &Record) {
|
||||
void ASTWriter::AddTypeSourceInfo(TypeSourceInfo *TInfo, RecordDataImpl &Record) {
|
||||
if (TInfo == 0) {
|
||||
AddTypeRef(QualType(), Record);
|
||||
return;
|
||||
|
|
@ -2864,7 +2865,7 @@ void ASTWriter::AddTypeSourceInfo(TypeSourceInfo *TInfo, RecordData &Record) {
|
|||
TLW.Visit(TL);
|
||||
}
|
||||
|
||||
void ASTWriter::AddTypeRef(QualType T, RecordData &Record) {
|
||||
void ASTWriter::AddTypeRef(QualType T, RecordDataImpl &Record) {
|
||||
Record.push_back(GetOrCreateTypeID(T));
|
||||
}
|
||||
|
||||
|
|
@ -2937,7 +2938,7 @@ DeclID ASTWriter::getDeclID(const Decl *D) {
|
|||
return DeclIDs[D];
|
||||
}
|
||||
|
||||
void ASTWriter::AddDeclarationName(DeclarationName Name, RecordData &Record) {
|
||||
void ASTWriter::AddDeclarationName(DeclarationName Name, RecordDataImpl &Record) {
|
||||
// FIXME: Emit a stable enum for NameKind. 0 = Identifier etc.
|
||||
Record.push_back(Name.getNameKind());
|
||||
switch (Name.getNameKind()) {
|
||||
|
|
@ -2972,7 +2973,7 @@ void ASTWriter::AddDeclarationName(DeclarationName Name, RecordData &Record) {
|
|||
}
|
||||
|
||||
void ASTWriter::AddDeclarationNameLoc(const DeclarationNameLoc &DNLoc,
|
||||
DeclarationName Name, RecordData &Record) {
|
||||
DeclarationName Name, RecordDataImpl &Record) {
|
||||
switch (Name.getNameKind()) {
|
||||
case DeclarationName::CXXConstructorName:
|
||||
case DeclarationName::CXXDestructorName:
|
||||
|
|
@ -3005,14 +3006,14 @@ void ASTWriter::AddDeclarationNameLoc(const DeclarationNameLoc &DNLoc,
|
|||
}
|
||||
|
||||
void ASTWriter::AddDeclarationNameInfo(const DeclarationNameInfo &NameInfo,
|
||||
RecordData &Record) {
|
||||
RecordDataImpl &Record) {
|
||||
AddDeclarationName(NameInfo.getName(), Record);
|
||||
AddSourceLocation(NameInfo.getLoc(), Record);
|
||||
AddDeclarationNameLoc(NameInfo.getInfo(), NameInfo.getName(), Record);
|
||||
}
|
||||
|
||||
void ASTWriter::AddQualifierInfo(const QualifierInfo &Info,
|
||||
RecordData &Record) {
|
||||
RecordDataImpl &Record) {
|
||||
AddNestedNameSpecifier(Info.NNS, Record);
|
||||
AddSourceRange(Info.NNSRange, Record);
|
||||
Record.push_back(Info.NumTemplParamLists);
|
||||
|
|
@ -3021,7 +3022,7 @@ void ASTWriter::AddQualifierInfo(const QualifierInfo &Info,
|
|||
}
|
||||
|
||||
void ASTWriter::AddNestedNameSpecifier(NestedNameSpecifier *NNS,
|
||||
RecordData &Record) {
|
||||
RecordDataImpl &Record) {
|
||||
// Nested name specifiers usually aren't too long. I think that 8 would
|
||||
// typically accomodate the vast majority.
|
||||
llvm::SmallVector<NestedNameSpecifier *, 8> NestedNames;
|
||||
|
|
@ -3059,7 +3060,7 @@ void ASTWriter::AddNestedNameSpecifier(NestedNameSpecifier *NNS,
|
|||
}
|
||||
}
|
||||
|
||||
void ASTWriter::AddTemplateName(TemplateName Name, RecordData &Record) {
|
||||
void ASTWriter::AddTemplateName(TemplateName Name, RecordDataImpl &Record) {
|
||||
TemplateName::NameKind Kind = Name.getKind();
|
||||
Record.push_back(Kind);
|
||||
switch (Kind) {
|
||||
|
|
@ -3098,7 +3099,7 @@ void ASTWriter::AddTemplateName(TemplateName Name, RecordData &Record) {
|
|||
}
|
||||
|
||||
void ASTWriter::AddTemplateArgument(const TemplateArgument &Arg,
|
||||
RecordData &Record) {
|
||||
RecordDataImpl &Record) {
|
||||
Record.push_back(Arg.getKind());
|
||||
switch (Arg.getKind()) {
|
||||
case TemplateArgument::Null:
|
||||
|
|
@ -3130,7 +3131,7 @@ void ASTWriter::AddTemplateArgument(const TemplateArgument &Arg,
|
|||
|
||||
void
|
||||
ASTWriter::AddTemplateParameterList(const TemplateParameterList *TemplateParams,
|
||||
RecordData &Record) {
|
||||
RecordDataImpl &Record) {
|
||||
assert(TemplateParams && "No TemplateParams!");
|
||||
AddSourceLocation(TemplateParams->getTemplateLoc(), Record);
|
||||
AddSourceLocation(TemplateParams->getLAngleLoc(), Record);
|
||||
|
|
@ -3145,7 +3146,7 @@ ASTWriter::AddTemplateParameterList(const TemplateParameterList *TemplateParams,
|
|||
/// \brief Emit a template argument list.
|
||||
void
|
||||
ASTWriter::AddTemplateArgumentList(const TemplateArgumentList *TemplateArgs,
|
||||
RecordData &Record) {
|
||||
RecordDataImpl &Record) {
|
||||
assert(TemplateArgs && "No TemplateArgs!");
|
||||
Record.push_back(TemplateArgs->flat_size());
|
||||
for (int i=0, e = TemplateArgs->flat_size(); i != e; ++i)
|
||||
|
|
@ -3154,7 +3155,7 @@ ASTWriter::AddTemplateArgumentList(const TemplateArgumentList *TemplateArgs,
|
|||
|
||||
|
||||
void
|
||||
ASTWriter::AddUnresolvedSet(const UnresolvedSetImpl &Set, RecordData &Record) {
|
||||
ASTWriter::AddUnresolvedSet(const UnresolvedSetImpl &Set, RecordDataImpl &Record) {
|
||||
Record.push_back(Set.size());
|
||||
for (UnresolvedSetImpl::const_iterator
|
||||
I = Set.begin(), E = Set.end(); I != E; ++I) {
|
||||
|
|
@ -3164,7 +3165,7 @@ ASTWriter::AddUnresolvedSet(const UnresolvedSetImpl &Set, RecordData &Record) {
|
|||
}
|
||||
|
||||
void ASTWriter::AddCXXBaseSpecifier(const CXXBaseSpecifier &Base,
|
||||
RecordData &Record) {
|
||||
RecordDataImpl &Record) {
|
||||
Record.push_back(Base.isVirtual());
|
||||
Record.push_back(Base.isBaseOfClass());
|
||||
Record.push_back(Base.getAccessSpecifierAsWritten());
|
||||
|
|
@ -3174,7 +3175,7 @@ void ASTWriter::AddCXXBaseSpecifier(const CXXBaseSpecifier &Base,
|
|||
|
||||
void ASTWriter::AddCXXBaseOrMemberInitializers(
|
||||
const CXXBaseOrMemberInitializer * const *BaseOrMembers,
|
||||
unsigned NumBaseOrMembers, RecordData &Record) {
|
||||
unsigned NumBaseOrMembers, RecordDataImpl &Record) {
|
||||
Record.push_back(NumBaseOrMembers);
|
||||
for (unsigned i=0; i != NumBaseOrMembers; ++i) {
|
||||
const CXXBaseOrMemberInitializer *Init = BaseOrMembers[i];
|
||||
|
|
@ -3202,6 +3203,43 @@ void ASTWriter::AddCXXBaseOrMemberInitializers(
|
|||
}
|
||||
}
|
||||
|
||||
void ASTWriter::AddCXXDefinitionData(const CXXRecordDecl *D, RecordDataImpl &Record) {
|
||||
assert(D->DefinitionData);
|
||||
struct CXXRecordDecl::DefinitionData &Data = *D->DefinitionData;
|
||||
Record.push_back(Data.UserDeclaredConstructor);
|
||||
Record.push_back(Data.UserDeclaredCopyConstructor);
|
||||
Record.push_back(Data.UserDeclaredCopyAssignment);
|
||||
Record.push_back(Data.UserDeclaredDestructor);
|
||||
Record.push_back(Data.Aggregate);
|
||||
Record.push_back(Data.PlainOldData);
|
||||
Record.push_back(Data.Empty);
|
||||
Record.push_back(Data.Polymorphic);
|
||||
Record.push_back(Data.Abstract);
|
||||
Record.push_back(Data.HasTrivialConstructor);
|
||||
Record.push_back(Data.HasTrivialCopyConstructor);
|
||||
Record.push_back(Data.HasTrivialCopyAssignment);
|
||||
Record.push_back(Data.HasTrivialDestructor);
|
||||
Record.push_back(Data.ComputedVisibleConversions);
|
||||
Record.push_back(Data.DeclaredDefaultConstructor);
|
||||
Record.push_back(Data.DeclaredCopyConstructor);
|
||||
Record.push_back(Data.DeclaredCopyAssignment);
|
||||
Record.push_back(Data.DeclaredDestructor);
|
||||
|
||||
Record.push_back(Data.NumBases);
|
||||
for (unsigned i = 0; i != Data.NumBases; ++i)
|
||||
AddCXXBaseSpecifier(Data.Bases[i], Record);
|
||||
|
||||
// FIXME: Make VBases lazily computed when needed to avoid storing them.
|
||||
Record.push_back(Data.NumVBases);
|
||||
for (unsigned i = 0; i != Data.NumVBases; ++i)
|
||||
AddCXXBaseSpecifier(Data.VBases[i], Record);
|
||||
|
||||
AddUnresolvedSet(Data.Conversions, Record);
|
||||
AddUnresolvedSet(Data.VisibleConversions, Record);
|
||||
// Data.Definition is the owning decl, no need to write it.
|
||||
AddDeclRef(Data.FirstFriend, Record);
|
||||
}
|
||||
|
||||
void ASTWriter::ReaderInitialized(ASTReader *Reader) {
|
||||
assert(Reader && "Cannot remove chain");
|
||||
assert(!Chain && "Cannot replace chain");
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ namespace clang {
|
|||
typedef ASTWriter::RecordData RecordData;
|
||||
RecordData &Record;
|
||||
|
||||
void WriteCXXDefinitionData(struct CXXRecordDecl::DefinitionData &Data);
|
||||
public:
|
||||
serialization::DeclCode Code;
|
||||
unsigned AbbrevToUse;
|
||||
|
|
@ -721,42 +720,6 @@ void ASTDeclWriter::VisitUnresolvedUsingTypenameDecl(
|
|||
Code = serialization::DECL_UNRESOLVED_USING_TYPENAME;
|
||||
}
|
||||
|
||||
void ASTDeclWriter::WriteCXXDefinitionData(
|
||||
struct CXXRecordDecl::DefinitionData &Data) {
|
||||
Record.push_back(Data.UserDeclaredConstructor);
|
||||
Record.push_back(Data.UserDeclaredCopyConstructor);
|
||||
Record.push_back(Data.UserDeclaredCopyAssignment);
|
||||
Record.push_back(Data.UserDeclaredDestructor);
|
||||
Record.push_back(Data.Aggregate);
|
||||
Record.push_back(Data.PlainOldData);
|
||||
Record.push_back(Data.Empty);
|
||||
Record.push_back(Data.Polymorphic);
|
||||
Record.push_back(Data.Abstract);
|
||||
Record.push_back(Data.HasTrivialConstructor);
|
||||
Record.push_back(Data.HasTrivialCopyConstructor);
|
||||
Record.push_back(Data.HasTrivialCopyAssignment);
|
||||
Record.push_back(Data.HasTrivialDestructor);
|
||||
Record.push_back(Data.ComputedVisibleConversions);
|
||||
Record.push_back(Data.DeclaredDefaultConstructor);
|
||||
Record.push_back(Data.DeclaredCopyConstructor);
|
||||
Record.push_back(Data.DeclaredCopyAssignment);
|
||||
Record.push_back(Data.DeclaredDestructor);
|
||||
|
||||
Record.push_back(Data.NumBases);
|
||||
for (unsigned i = 0; i != Data.NumBases; ++i)
|
||||
Writer.AddCXXBaseSpecifier(Data.Bases[i], Record);
|
||||
|
||||
// FIXME: Make VBases lazily computed when needed to avoid storing them.
|
||||
Record.push_back(Data.NumVBases);
|
||||
for (unsigned i = 0; i != Data.NumVBases; ++i)
|
||||
Writer.AddCXXBaseSpecifier(Data.VBases[i], Record);
|
||||
|
||||
Writer.AddUnresolvedSet(Data.Conversions, Record);
|
||||
Writer.AddUnresolvedSet(Data.VisibleConversions, Record);
|
||||
// Data.Definition is the owning decl, no need to write it.
|
||||
Writer.AddDeclRef(Data.FirstFriend, Record);
|
||||
}
|
||||
|
||||
void ASTDeclWriter::VisitCXXRecordDecl(CXXRecordDecl *D) {
|
||||
VisitRecordDecl(D);
|
||||
|
||||
|
|
@ -764,10 +727,8 @@ void ASTDeclWriter::VisitCXXRecordDecl(CXXRecordDecl *D) {
|
|||
if (D->DefinitionData)
|
||||
DefinitionDecl = D->DefinitionData->Definition;
|
||||
Writer.AddDeclRef(DefinitionDecl, Record);
|
||||
if (D == DefinitionDecl) {
|
||||
assert(D->DefinitionData);
|
||||
WriteCXXDefinitionData(*D->DefinitionData);
|
||||
}
|
||||
if (D == DefinitionDecl)
|
||||
Writer.AddCXXDefinitionData(D, Record);
|
||||
|
||||
enum {
|
||||
CXXRecNotTemplate = 0, CXXRecTemplate, CXXRecMemberSpecialization
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче