<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Thanks for the quick reaction! Our bots are happy again, too.<div class=""><br class=""></div><div class="">-- adrian<br class=""><div><blockquote type="cite" class=""><div class="">On Apr 6, 2016, at 10:13 AM, Richard Smith <<a href="mailto:richard@metafoo.co.uk" class="">richard@metafoo.co.uk</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Thanks, should be fixed in r265564.</div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Tue, Apr 5, 2016 at 1:44 PM, Adrian Prantl via cfe-commits <span dir="ltr" class=""><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank" class="">cfe-commits@lists.llvm.org</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Richard,<br class="">
<br class="">
it looks like this commit has caused a 6% size regression when building a PCH from OS X’s Cocoa.h. When comparing the llvm-bcanalyzer output for r265187 and r265195 the most noticeable diff is in the DECLTYPES_BLOCK:<br class="">
<br class="">
Block ID #11 (DECLTYPES_BLOCK):<br class="">
Num Instances: 1<br class="">
- Total Size: 50609331b/6326166.38B/1581541W<br class="">
- Percent of file: 42.1507%<br class="">
+ Total Size: 55982899b/6997862.38B/1749465W<br class="">
+ Percent of file: 44.6289%<br class="">
Num SubBlocks: 0<br class="">
Num Abbrevs: 16<br class="">
Num Records: 192517<br class="">
- Percent Abbrevs: 40.5408%<br class="">
+ Percent Abbrevs: 20.3540%<br class="">
<br class="">
And it looks like the only part of the commit that was not obviously NFC is also in ASTWriter::WriteDecl().<br class="">
<br class="">
Could you please have a look?<br class="">
<br class="">
Let me know if I can help provide any other diagnostics or testcases. Thanks,<br class="">
Adrian<br class="">
<div class="HOEnZb"><div class="h5"><br class="">
> On Apr 1, 2016, at 3:52 PM, Richard Smith via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a>> wrote:<br class="">
><br class="">
> Author: rsmith<br class="">
> Date: Fri Apr 1 17:52:03 2016<br class="">
> New Revision: 265195<br class="">
><br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=265195&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=265195&view=rev</a><br class="">
> Log:<br class="">
> [modules] Start moving the code for encoding AST records out of ASTWriter into<br class="">
> a separate class. The goal is for this class to have a separate lifetime from<br class="">
> the AST writer so that it can meaningfully track pending statement nodes and<br class="">
> context for more compact encoding of various types.<br class="">
><br class="">
> Modified:<br class="">
> cfe/trunk/include/clang/Serialization/ASTWriter.h<br class="">
> cfe/trunk/lib/Serialization/ASTWriter.cpp<br class="">
> cfe/trunk/lib/Serialization/ASTWriterDecl.cpp<br class="">
> cfe/trunk/lib/Serialization/ASTWriterStmt.cpp<br class="">
><br class="">
> Modified: cfe/trunk/include/clang/Serialization/ASTWriter.h<br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTWriter.h?rev=265195&r1=265194&r2=265195&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTWriter.h?rev=265195&r1=265194&r2=265195&view=diff</a><br class="">
> ==============================================================================<br class="">
> --- cfe/trunk/include/clang/Serialization/ASTWriter.h (original)<br class="">
> +++ cfe/trunk/include/clang/Serialization/ASTWriter.h Fri Apr 1 17:52:03 2016<br class="">
> @@ -90,6 +90,7 @@ public:<br class="">
><br class="">
> friend class ASTDeclWriter;<br class="">
> friend class ASTStmtWriter;<br class="">
> + friend class ASTRecordWriter;<br class="">
> private:<br class="">
> /// \brief Map that provides the ID numbers of each type within the<br class="">
> /// output stream, plus those deserialized from a chained PCH.<br class="">
> @@ -523,7 +524,6 @@ private:<br class="">
> void WriteReferencedSelectorsPool(Sema &SemaRef);<br class="">
> void WriteIdentifierTable(Preprocessor &PP, IdentifierResolver &IdResolver,<br class="">
> bool IsModule);<br class="">
> - void WriteAttributes(ArrayRef<const Attr*> Attrs, RecordDataImpl &Record);<br class="">
> void WriteDeclUpdatesBlocks(RecordDataImpl &OffsetsRecord);<br class="">
> void WriteDeclContextVisibleUpdate(const DeclContext *DC);<br class="">
> void WriteFPPragmaOptions(const FPOptions &Opts);<br class="">
> @@ -555,7 +555,7 @@ private:<br class="">
><br class="">
> void WriteDeclAbbrevs();<br class="">
> void WriteDecl(ASTContext &Context, Decl *D);<br class="">
> - void AddFunctionDefinition(const FunctionDecl *FD, RecordData &Record);<br class="">
> + void AddFunctionDefinition(const FunctionDecl *FD, RecordDataImpl &Record);<br class="">
><br class="">
> uint64_t WriteASTCore(Sema &SemaRef,<br class="">
> StringRef isysroot, const std::string &OutputFile,<br class="">
> @@ -684,6 +684,8 @@ public:<br class="">
> /// declaration.<br class="">
> serialization::DeclID getDeclID(const Decl *D);<br class="">
><br class="">
> + void AddAttributes(ArrayRef<const Attr*> Attrs, RecordDataImpl &Record);<br class="">
> +<br class="">
> /// \brief Emit a declaration name.<br class="">
> void AddDeclarationName(DeclarationName Name, RecordDataImpl &Record);<br class="">
> void AddDeclarationNameLoc(const DeclarationNameLoc &DNLoc,<br class="">
> @@ -864,6 +866,219 @@ public:<br class="">
> const RecordDecl *Record) override;<br class="">
> };<br class="">
><br class="">
> +/// \brief An object for streaming information to a record.<br class="">
> +class ASTRecordWriter {<br class="">
> + ASTWriter *Writer;<br class="">
> + ASTWriter::RecordDataImpl *Record;<br class="">
> +<br class="">
> +public:<br class="">
> + /// Construct a ASTRecordWriter that uses the default encoding scheme.<br class="">
> + ASTRecordWriter(ASTWriter &Writer, ASTWriter::RecordDataImpl &Record)<br class="">
> + : Writer(&Writer), Record(&Record) {}<br class="">
> +<br class="">
> + /// Construct a ASTRecordWriter that uses the same encoding scheme as another<br class="">
> + /// ASTRecordWriter.<br class="">
> + ASTRecordWriter(ASTRecordWriter &Parent, ASTWriter::RecordDataImpl &Record)<br class="">
> + : Writer(Parent.Writer), Record(&Record) {}<br class="">
> +<br class="">
> + /// \brief Extract the underlying record storage.<br class="">
> + ASTWriter::RecordDataImpl &getRecordData() const { return *Record; }<br class="">
> +<br class="">
> + /// \brief Minimal vector-like interface.<br class="">
> + /// @{<br class="">
> + void push_back(uint64_t N) { Record->push_back(N); }<br class="">
> + template<typename InputIterator><br class="">
> + void append(InputIterator begin, InputIterator end) {<br class="">
> + Record->append(begin, end);<br class="">
> + }<br class="">
> + bool empty() const { return Record->empty(); }<br class="">
> + size_t size() const { return Record->size(); }<br class="">
> + uint64_t &operator[](size_t N) { return (*Record)[N]; }<br class="">
> + /// @}<br class="">
> +<br class="">
> +<br class="">
> + /// \brief Emit the record to the stream, and return its offset.<br class="">
> + // FIXME: Allow record producers to suggest Abbrevs.<br class="">
> + uint64_t Emit(unsigned Code, unsigned Abbrev = 0) {<br class="">
> + uint64_t Offset = Writer->Stream.GetCurrentBitNo();<br class="">
> + Writer->Stream.EmitRecord(Code, *Record);<br class="">
> + return Offset;<br class="">
> + }<br class="">
> +<br class="">
> +<br class="">
> + /// \brief Emit a source location.<br class="">
> + void AddSourceLocation(SourceLocation Loc) {<br class="">
> + return Writer->AddSourceLocation(Loc, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a source range.<br class="">
> + void AddSourceRange(SourceRange Range) {<br class="">
> + return Writer->AddSourceRange(Range, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit an integral value.<br class="">
> + void AddAPInt(const llvm::APInt &Value) {<br class="">
> + return Writer->AddAPInt(Value, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a signed integral value.<br class="">
> + void AddAPSInt(const llvm::APSInt &Value) {<br class="">
> + return Writer->AddAPSInt(Value, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a floating-point value.<br class="">
> + void AddAPFloat(const llvm::APFloat &Value) {<br class="">
> + return Writer->AddAPFloat(Value, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a reference to an identifier.<br class="">
> + void AddIdentifierRef(const IdentifierInfo *II) {<br class="">
> + return Writer->AddIdentifierRef(II, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a Selector (which is a smart pointer reference).<br class="">
> + void AddSelectorRef(Selector S) {<br class="">
> + return Writer->AddSelectorRef(S, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a CXXTemporary.<br class="">
> + void AddCXXTemporary(const CXXTemporary *Temp) {<br class="">
> + return Writer->AddCXXTemporary(Temp, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a set of C++ base specifiers.<br class="">
> + void AddCXXBaseSpecifiersRef(const CXXBaseSpecifier *BasesBegin,<br class="">
> + const CXXBaseSpecifier *BasesEnd) {<br class="">
> + return Writer->AddCXXBaseSpecifiersRef(BasesBegin, BasesEnd, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a reference to a type.<br class="">
> + void AddTypeRef(QualType T) {<br class="">
> + return Writer->AddTypeRef(T, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emits a reference to a declarator info.<br class="">
> + void AddTypeSourceInfo(TypeSourceInfo *TInfo) {<br class="">
> + return Writer->AddTypeSourceInfo(TInfo, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emits a template argument location info.<br class="">
> + void AddTemplateArgumentLocInfo(TemplateArgument::ArgKind Kind,<br class="">
> + const TemplateArgumentLocInfo &Arg) {<br class="">
> + return Writer->AddTemplateArgumentLocInfo(Kind, Arg, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emits a template argument location.<br class="">
> + void AddTemplateArgumentLoc(const TemplateArgumentLoc &Arg) {<br class="">
> + return Writer->AddTemplateArgumentLoc(Arg, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emits an AST template argument list info.<br class="">
> + void AddASTTemplateArgumentListInfo(<br class="">
> + const ASTTemplateArgumentListInfo *ASTTemplArgList) {<br class="">
> + return Writer->AddASTTemplateArgumentListInfo(ASTTemplArgList, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a reference to a declaration.<br class="">
> + void AddDeclRef(const Decl *D) {<br class="">
> + return Writer->AddDeclRef(D, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + void AddDeclarationName(DeclarationName Name) {<br class="">
> + return Writer->AddDeclarationName(Name, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + void AddDeclarationNameLoc(const DeclarationNameLoc &DNLoc,<br class="">
> + DeclarationName Name) {<br class="">
> + return Writer->AddDeclarationNameLoc(DNLoc, Name, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + void AddDeclarationNameInfo(const DeclarationNameInfo &NameInfo) {<br class="">
> + return Writer->AddDeclarationNameInfo(NameInfo, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + void AddQualifierInfo(const QualifierInfo &Info) {<br class="">
> + return Writer->AddQualifierInfo(Info, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a nested name specifier.<br class="">
> + void AddNestedNameSpecifier(NestedNameSpecifier *NNS) {<br class="">
> + return Writer->AddNestedNameSpecifier(NNS, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a nested name specifier with source-location information.<br class="">
> + void AddNestedNameSpecifierLoc(NestedNameSpecifierLoc NNS) {<br class="">
> + return Writer->AddNestedNameSpecifierLoc(NNS, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a template name.<br class="">
> + void AddTemplateName(TemplateName Name) {<br class="">
> + return Writer->AddTemplateName(Name, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a template argument.<br class="">
> + void AddTemplateArgument(const TemplateArgument &Arg) {<br class="">
> + return Writer->AddTemplateArgument(Arg, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a template parameter list.<br class="">
> + void AddTemplateParameterList(const TemplateParameterList *TemplateParams) {<br class="">
> + return Writer->AddTemplateParameterList(TemplateParams, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a template argument list.<br class="">
> + void AddTemplateArgumentList(const TemplateArgumentList *TemplateArgs) {<br class="">
> + return Writer->AddTemplateArgumentList(TemplateArgs, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a UnresolvedSet structure.<br class="">
> + void AddUnresolvedSet(const ASTUnresolvedSet &Set) {<br class="">
> + return Writer->AddUnresolvedSet(Set, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a C++ base specifier.<br class="">
> + void AddCXXBaseSpecifier(const CXXBaseSpecifier &Base) {<br class="">
> + return Writer->AddCXXBaseSpecifier(Base, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit the ID for a CXXCtorInitializer array and register the array<br class="">
> + /// for later serialization.<br class="">
> + void AddCXXCtorInitializersRef(ArrayRef<CXXCtorInitializer *> Inits) {<br class="">
> + return Writer->AddCXXCtorInitializersRef(Inits, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a CXXCtorInitializer array.<br class="">
> + void AddCXXCtorInitializers(const CXXCtorInitializer *const *CtorInitializers,<br class="">
> + unsigned NumCtorInitializers) {<br class="">
> + return Writer->AddCXXCtorInitializers(CtorInitializers, NumCtorInitializers,<br class="">
> + *Record);<br class="">
> + }<br class="">
> +<br class="">
> + void AddCXXDefinitionData(const CXXRecordDecl *D) {<br class="">
> + return Writer->AddCXXDefinitionData(D, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a string.<br class="">
> + void AddString(StringRef Str) {<br class="">
> + return Writer->AddString(Str, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a path.<br class="">
> + void AddPath(StringRef Path) {<br class="">
> + return Writer->AddPath(Path, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a version tuple.<br class="">
> + void AddVersionTuple(const VersionTuple &Version) {<br class="">
> + return Writer->AddVersionTuple(Version, *Record);<br class="">
> + }<br class="">
> +<br class="">
> + /// \brief Emit a list of attributes.<br class="">
> + void AddAttributes(ArrayRef<const Attr*> Attrs) {<br class="">
> + return Writer->AddAttributes(Attrs, *Record);<br class="">
> + }<br class="">
> +};<br class="">
> +<br class="">
> /// \brief AST and semantic-analysis consumer that generates a<br class="">
> /// precompiled header from the parsed source code.<br class="">
> class PCHGenerator : public SemaConsumer {<br class="">
><br class="">
> Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp<br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=265195&r1=265194&r2=265195&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=265195&r1=265194&r2=265195&view=diff</a><br class="">
> ==============================================================================<br class="">
> --- cfe/trunk/lib/Serialization/ASTWriter.cpp (original)<br class="">
> +++ cfe/trunk/lib/Serialization/ASTWriter.cpp Fri Apr 1 17:52:03 2016<br class="">
> @@ -85,7 +85,7 @@ static StringRef bytes(const SmallVector<br class="">
> namespace {<br class="">
> class ASTTypeWriter {<br class="">
> ASTWriter &Writer;<br class="">
> - ASTWriter::RecordDataImpl &Record;<br class="">
> + ASTRecordWriter Record;<br class="">
><br class="">
> public:<br class="">
> /// \brief Type code that corresponds to the record generated.<br class="">
> @@ -94,7 +94,7 @@ namespace {<br class="">
> unsigned AbbrevToUse;<br class="">
><br class="">
> ASTTypeWriter(ASTWriter &Writer, ASTWriter::RecordDataImpl &Record)<br class="">
> - : Writer(Writer), Record(Record), Code(TYPE_EXT_QUAL) { }<br class="">
> + : Writer(Writer), Record(Writer, Record), Code(TYPE_EXT_QUAL) { }<br class="">
><br class="">
> void VisitArrayType(const ArrayType *T);<br class="">
> void VisitFunctionType(const FunctionType *T);<br class="">
> @@ -111,57 +111,57 @@ void ASTTypeWriter::VisitBuiltinType(con<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitComplexType(const ComplexType *T) {<br class="">
> - Writer.AddTypeRef(T->getElementType(), Record);<br class="">
> + Record.AddTypeRef(T->getElementType());<br class="">
> Code = TYPE_COMPLEX;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitPointerType(const PointerType *T) {<br class="">
> - Writer.AddTypeRef(T->getPointeeType(), Record);<br class="">
> + Record.AddTypeRef(T->getPointeeType());<br class="">
> Code = TYPE_POINTER;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitDecayedType(const DecayedType *T) {<br class="">
> - Writer.AddTypeRef(T->getOriginalType(), Record);<br class="">
> + Record.AddTypeRef(T->getOriginalType());<br class="">
> Code = TYPE_DECAYED;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitAdjustedType(const AdjustedType *T) {<br class="">
> - Writer.AddTypeRef(T->getOriginalType(), Record);<br class="">
> - Writer.AddTypeRef(T->getAdjustedType(), Record);<br class="">
> + Record.AddTypeRef(T->getOriginalType());<br class="">
> + Record.AddTypeRef(T->getAdjustedType());<br class="">
> Code = TYPE_ADJUSTED;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitBlockPointerType(const BlockPointerType *T) {<br class="">
> - Writer.AddTypeRef(T->getPointeeType(), Record);<br class="">
> + Record.AddTypeRef(T->getPointeeType());<br class="">
> Code = TYPE_BLOCK_POINTER;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitLValueReferenceType(const LValueReferenceType *T) {<br class="">
> - Writer.AddTypeRef(T->getPointeeTypeAsWritten(), Record);<br class="">
> + Record.AddTypeRef(T->getPointeeTypeAsWritten());<br class="">
> Record.push_back(T->isSpelledAsLValue());<br class="">
> Code = TYPE_LVALUE_REFERENCE;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitRValueReferenceType(const RValueReferenceType *T) {<br class="">
> - Writer.AddTypeRef(T->getPointeeTypeAsWritten(), Record);<br class="">
> + Record.AddTypeRef(T->getPointeeTypeAsWritten());<br class="">
> Code = TYPE_RVALUE_REFERENCE;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitMemberPointerType(const MemberPointerType *T) {<br class="">
> - Writer.AddTypeRef(T->getPointeeType(), Record);<br class="">
> - Writer.AddTypeRef(QualType(T->getClass(), 0), Record);<br class="">
> + Record.AddTypeRef(T->getPointeeType());<br class="">
> + Record.AddTypeRef(QualType(T->getClass(), 0));<br class="">
> Code = TYPE_MEMBER_POINTER;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitArrayType(const ArrayType *T) {<br class="">
> - Writer.AddTypeRef(T->getElementType(), Record);<br class="">
> + Record.AddTypeRef(T->getElementType());<br class="">
> Record.push_back(T->getSizeModifier()); // FIXME: stable values<br class="">
> Record.push_back(T->getIndexTypeCVRQualifiers()); // FIXME: stable values<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitConstantArrayType(const ConstantArrayType *T) {<br class="">
> VisitArrayType(T);<br class="">
> - Writer.AddAPInt(T->getSize(), Record);<br class="">
> + Record.AddAPInt(T->getSize());<br class="">
> Code = TYPE_CONSTANT_ARRAY;<br class="">
> }<br class="">
><br class="">
> @@ -172,14 +172,14 @@ void ASTTypeWriter::VisitIncompleteArray<br class="">
><br class="">
> void ASTTypeWriter::VisitVariableArrayType(const VariableArrayType *T) {<br class="">
> VisitArrayType(T);<br class="">
> - Writer.AddSourceLocation(T->getLBracketLoc(), Record);<br class="">
> - Writer.AddSourceLocation(T->getRBracketLoc(), Record);<br class="">
> + Record.AddSourceLocation(T->getLBracketLoc());<br class="">
> + Record.AddSourceLocation(T->getRBracketLoc());<br class="">
> Writer.AddStmt(T->getSizeExpr());<br class="">
> Code = TYPE_VARIABLE_ARRAY;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitVectorType(const VectorType *T) {<br class="">
> - Writer.AddTypeRef(T->getElementType(), Record);<br class="">
> + Record.AddTypeRef(T->getElementType());<br class="">
> Record.push_back(T->getNumElements());<br class="">
> Record.push_back(T->getVectorKind());<br class="">
> Code = TYPE_VECTOR;<br class="">
> @@ -191,7 +191,7 @@ void ASTTypeWriter::VisitExtVectorType(c<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitFunctionType(const FunctionType *T) {<br class="">
> - Writer.AddTypeRef(T->getReturnType(), Record);<br class="">
> + Record.AddTypeRef(T->getReturnType());<br class="">
> FunctionType::ExtInfo C = T->getExtInfo();<br class="">
> Record.push_back(C.getNoReturn());<br class="">
> Record.push_back(C.getHasRegParm());<br class="">
> @@ -210,19 +210,19 @@ void ASTTypeWriter::VisitFunctionNoProto<br class="">
> }<br class="">
><br class="">
> static void addExceptionSpec(ASTWriter &Writer, const FunctionProtoType *T,<br class="">
> - ASTWriter::RecordDataImpl &Record) {<br class="">
> + ASTRecordWriter Record) {<br class="">
> Record.push_back(T->getExceptionSpecType());<br class="">
> if (T->getExceptionSpecType() == EST_Dynamic) {<br class="">
> Record.push_back(T->getNumExceptions());<br class="">
> for (unsigned I = 0, N = T->getNumExceptions(); I != N; ++I)<br class="">
> - Writer.AddTypeRef(T->getExceptionType(I), Record);<br class="">
> + Record.AddTypeRef(T->getExceptionType(I));<br class="">
> } else if (T->getExceptionSpecType() == EST_ComputedNoexcept) {<br class="">
> Writer.AddStmt(T->getNoexceptExpr());<br class="">
> } else if (T->getExceptionSpecType() == EST_Uninstantiated) {<br class="">
> - Writer.AddDeclRef(T->getExceptionSpecDecl(), Record);<br class="">
> - Writer.AddDeclRef(T->getExceptionSpecTemplate(), Record);<br class="">
> + Record.AddDeclRef(T->getExceptionSpecDecl());<br class="">
> + Record.AddDeclRef(T->getExceptionSpecTemplate());<br class="">
> } else if (T->getExceptionSpecType() == EST_Unevaluated) {<br class="">
> - Writer.AddDeclRef(T->getExceptionSpecDecl(), Record);<br class="">
> + Record.AddDeclRef(T->getExceptionSpecDecl());<br class="">
> }<br class="">
> }<br class="">
><br class="">
> @@ -237,7 +237,7 @@ void ASTTypeWriter::VisitFunctionProtoTy<br class="">
><br class="">
> Record.push_back(T->getNumParams());<br class="">
> for (unsigned I = 0, N = T->getNumParams(); I != N; ++I)<br class="">
> - Writer.AddTypeRef(T->getParamType(I), Record);<br class="">
> + Record.AddTypeRef(T->getParamType(I));<br class="">
><br class="">
> if (T->hasExtParameterInfos()) {<br class="">
> for (unsigned I = 0, N = T->getNumParams(); I != N; ++I)<br class="">
> @@ -253,14 +253,14 @@ void ASTTypeWriter::VisitFunctionProtoTy<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitUnresolvedUsingType(const UnresolvedUsingType *T) {<br class="">
> - Writer.AddDeclRef(T->getDecl(), Record);<br class="">
> + Record.AddDeclRef(T->getDecl());<br class="">
> Code = TYPE_UNRESOLVED_USING;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitTypedefType(const TypedefType *T) {<br class="">
> - Writer.AddDeclRef(T->getDecl(), Record);<br class="">
> + Record.AddDeclRef(T->getDecl());<br class="">
> assert(!T->isCanonicalUnqualified() && "Invalid typedef ?");<br class="">
> - Writer.AddTypeRef(T->getCanonicalTypeInternal(), Record);<br class="">
> + Record.AddTypeRef(T->getCanonicalTypeInternal());<br class="">
> Code = TYPE_TYPEDEF;<br class="">
> }<br class="">
><br class="">
> @@ -270,25 +270,25 @@ void ASTTypeWriter::VisitTypeOfExprType(<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitTypeOfType(const TypeOfType *T) {<br class="">
> - Writer.AddTypeRef(T->getUnderlyingType(), Record);<br class="">
> + Record.AddTypeRef(T->getUnderlyingType());<br class="">
> Code = TYPE_TYPEOF;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitDecltypeType(const DecltypeType *T) {<br class="">
> - Writer.AddTypeRef(T->getUnderlyingType(), Record);<br class="">
> + Record.AddTypeRef(T->getUnderlyingType());<br class="">
> Writer.AddStmt(T->getUnderlyingExpr());<br class="">
> Code = TYPE_DECLTYPE;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitUnaryTransformType(const UnaryTransformType *T) {<br class="">
> - Writer.AddTypeRef(T->getBaseType(), Record);<br class="">
> - Writer.AddTypeRef(T->getUnderlyingType(), Record);<br class="">
> + Record.AddTypeRef(T->getBaseType());<br class="">
> + Record.AddTypeRef(T->getUnderlyingType());<br class="">
> Record.push_back(T->getUTTKind());<br class="">
> Code = TYPE_UNARY_TRANSFORM;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitAutoType(const AutoType *T) {<br class="">
> - Writer.AddTypeRef(T->getDeducedType(), Record);<br class="">
> + Record.AddTypeRef(T->getDeducedType());<br class="">
> Record.push_back((unsigned)T->getKeyword());<br class="">
> if (T->getDeducedType().isNull())<br class="">
> Record.push_back(T->isDependentType());<br class="">
> @@ -297,7 +297,7 @@ void ASTTypeWriter::VisitAutoType(const<br class="">
><br class="">
> void ASTTypeWriter::VisitTagType(const TagType *T) {<br class="">
> Record.push_back(T->isDependentType());<br class="">
> - Writer.AddDeclRef(T->getDecl()->getCanonicalDecl(), Record);<br class="">
> + Record.AddDeclRef(T->getDecl()->getCanonicalDecl());<br class="">
> assert(!T->isBeingDefined() &&<br class="">
> "Cannot serialize in the middle of a type definition");<br class="">
> }<br class="">
> @@ -313,8 +313,8 @@ void ASTTypeWriter::VisitEnumType(const<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitAttributedType(const AttributedType *T) {<br class="">
> - Writer.AddTypeRef(T->getModifiedType(), Record);<br class="">
> - Writer.AddTypeRef(T->getEquivalentType(), Record);<br class="">
> + Record.AddTypeRef(T->getModifiedType());<br class="">
> + Record.AddTypeRef(T->getEquivalentType());<br class="">
> Record.push_back(T->getAttrKind());<br class="">
> Code = TYPE_ATTRIBUTED;<br class="">
> }<br class="">
> @@ -322,16 +322,16 @@ void ASTTypeWriter::VisitAttributedType(<br class="">
> void<br class="">
> ASTTypeWriter::VisitSubstTemplateTypeParmType(<br class="">
> const SubstTemplateTypeParmType *T) {<br class="">
> - Writer.AddTypeRef(QualType(T->getReplacedParameter(), 0), Record);<br class="">
> - Writer.AddTypeRef(T->getReplacementType(), Record);<br class="">
> + Record.AddTypeRef(QualType(T->getReplacedParameter(), 0));<br class="">
> + Record.AddTypeRef(T->getReplacementType());<br class="">
> Code = TYPE_SUBST_TEMPLATE_TYPE_PARM;<br class="">
> }<br class="">
><br class="">
> void<br class="">
> ASTTypeWriter::VisitSubstTemplateTypeParmPackType(<br class="">
> const SubstTemplateTypeParmPackType *T) {<br class="">
> - Writer.AddTypeRef(QualType(T->getReplacedParameter(), 0), Record);<br class="">
> - Writer.AddTemplateArgument(T->getArgumentPack(), Record);<br class="">
> + Record.AddTypeRef(QualType(T->getReplacedParameter(), 0));<br class="">
> + Record.AddTemplateArgument(T->getArgumentPack());<br class="">
> Code = TYPE_SUBST_TEMPLATE_TYPE_PARM_PACK;<br class="">
> }<br class="">
><br class="">
> @@ -339,14 +339,14 @@ void<br class="">
> ASTTypeWriter::VisitTemplateSpecializationType(<br class="">
> const TemplateSpecializationType *T) {<br class="">
> Record.push_back(T->isDependentType());<br class="">
> - Writer.AddTemplateName(T->getTemplateName(), Record);<br class="">
> + Record.AddTemplateName(T->getTemplateName());<br class="">
> Record.push_back(T->getNumArgs());<br class="">
> for (const auto &ArgI : *T)<br class="">
> - Writer.AddTemplateArgument(ArgI, Record);<br class="">
> - Writer.AddTypeRef(T->isTypeAlias() ? T->getAliasedType() :<br class="">
> - T->isCanonicalUnqualified() ? QualType()<br class="">
> - : T->getCanonicalTypeInternal(),<br class="">
> - Record);<br class="">
> + Record.AddTemplateArgument(ArgI);<br class="">
> + Record.AddTypeRef(T->isTypeAlias() ? T->getAliasedType()<br class="">
> + : T->isCanonicalUnqualified()<br class="">
> + ? QualType()<br class="">
> + : T->getCanonicalTypeInternal());<br class="">
> Code = TYPE_TEMPLATE_SPECIALIZATION;<br class="">
> }<br class="">
><br class="">
> @@ -354,7 +354,7 @@ void<br class="">
> ASTTypeWriter::VisitDependentSizedArrayType(const DependentSizedArrayType *T) {<br class="">
> VisitArrayType(T);<br class="">
> Writer.AddStmt(T->getSizeExpr());<br class="">
> - Writer.AddSourceRange(T->getBracketsRange(), Record);<br class="">
> + Record.AddSourceRange(T->getBracketsRange());<br class="">
> Code = TYPE_DEPENDENT_SIZED_ARRAY;<br class="">
> }<br class="">
><br class="">
> @@ -370,18 +370,17 @@ ASTTypeWriter::VisitTemplateTypeParmType<br class="">
> Record.push_back(T->getDepth());<br class="">
> Record.push_back(T->getIndex());<br class="">
> Record.push_back(T->isParameterPack());<br class="">
> - Writer.AddDeclRef(T->getDecl(), Record);<br class="">
> + Record.AddDeclRef(T->getDecl());<br class="">
> Code = TYPE_TEMPLATE_TYPE_PARM;<br class="">
> }<br class="">
><br class="">
> void<br class="">
> ASTTypeWriter::VisitDependentNameType(const DependentNameType *T) {<br class="">
> Record.push_back(T->getKeyword());<br class="">
> - Writer.AddNestedNameSpecifier(T->getQualifier(), Record);<br class="">
> - Writer.AddIdentifierRef(T->getIdentifier(), Record);<br class="">
> - Writer.AddTypeRef(T->isCanonicalUnqualified() ? QualType()<br class="">
> - : T->getCanonicalTypeInternal(),<br class="">
> - Record);<br class="">
> + Record.AddNestedNameSpecifier(T->getQualifier());<br class="">
> + Record.AddIdentifierRef(T->getIdentifier());<br class="">
> + Record.AddTypeRef(<br class="">
> + T->isCanonicalUnqualified() ? QualType() : T->getCanonicalTypeInternal());<br class="">
> Code = TYPE_DEPENDENT_NAME;<br class="">
> }<br class="">
><br class="">
> @@ -389,16 +388,16 @@ void<br class="">
> ASTTypeWriter::VisitDependentTemplateSpecializationType(<br class="">
> const DependentTemplateSpecializationType *T) {<br class="">
> Record.push_back(T->getKeyword());<br class="">
> - Writer.AddNestedNameSpecifier(T->getQualifier(), Record);<br class="">
> - Writer.AddIdentifierRef(T->getIdentifier(), Record);<br class="">
> + Record.AddNestedNameSpecifier(T->getQualifier());<br class="">
> + Record.AddIdentifierRef(T->getIdentifier());<br class="">
> Record.push_back(T->getNumArgs());<br class="">
> for (const auto &I : *T)<br class="">
> - Writer.AddTemplateArgument(I, Record);<br class="">
> + Record.AddTemplateArgument(I);<br class="">
> Code = TYPE_DEPENDENT_TEMPLATE_SPECIALIZATION;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitPackExpansionType(const PackExpansionType *T) {<br class="">
> - Writer.AddTypeRef(T->getPattern(), Record);<br class="">
> + Record.AddTypeRef(T->getPattern());<br class="">
> if (Optional<unsigned> NumExpansions = T->getNumExpansions())<br class="">
> Record.push_back(*NumExpansions + 1);<br class="">
> else<br class="">
> @@ -407,55 +406,55 @@ void ASTTypeWriter::VisitPackExpansionTy<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitParenType(const ParenType *T) {<br class="">
> - Writer.AddTypeRef(T->getInnerType(), Record);<br class="">
> + Record.AddTypeRef(T->getInnerType());<br class="">
> Code = TYPE_PAREN;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitElaboratedType(const ElaboratedType *T) {<br class="">
> Record.push_back(T->getKeyword());<br class="">
> - Writer.AddNestedNameSpecifier(T->getQualifier(), Record);<br class="">
> - Writer.AddTypeRef(T->getNamedType(), Record);<br class="">
> + Record.AddNestedNameSpecifier(T->getQualifier());<br class="">
> + Record.AddTypeRef(T->getNamedType());<br class="">
> Code = TYPE_ELABORATED;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitInjectedClassNameType(const InjectedClassNameType *T) {<br class="">
> - Writer.AddDeclRef(T->getDecl()->getCanonicalDecl(), Record);<br class="">
> - Writer.AddTypeRef(T->getInjectedSpecializationType(), Record);<br class="">
> + Record.AddDeclRef(T->getDecl()->getCanonicalDecl());<br class="">
> + Record.AddTypeRef(T->getInjectedSpecializationType());<br class="">
> Code = TYPE_INJECTED_CLASS_NAME;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitObjCInterfaceType(const ObjCInterfaceType *T) {<br class="">
> - Writer.AddDeclRef(T->getDecl()->getCanonicalDecl(), Record);<br class="">
> + Record.AddDeclRef(T->getDecl()->getCanonicalDecl());<br class="">
> Code = TYPE_OBJC_INTERFACE;<br class="">
> }<br class="">
><br class="">
> void ASTTypeWriter::VisitObjCObjectType(const ObjCObjectType *T) {<br class="">
> - Writer.AddTypeRef(T->getBaseType(), Record);<br class="">
> + Record.AddTypeRef(T->getBaseType());<br class="">
> Record.push_back(T->getTypeArgsAsWritten().size());<br class="">
> for (auto TypeArg : T->getTypeArgsAsWritten())<br class="">
> - Writer.AddTypeRef(TypeArg, Record);<br class="">
> + Record.AddTypeRef(TypeArg);<br class="">
> Record.push_back(T->getNumProtocols());<br class="">
> for (const auto *I : T->quals())<br class="">
> - Writer.AddDeclRef(I, Record);<br class="">
> + Record.AddDeclRef(I);<br class="">
> Record.push_back(T->isKindOfTypeAsWritten());<br class="">
> Code = TYPE_OBJC_OBJECT;<br class="">
> }<br class="">
><br class="">
> void<br class="">
> ASTTypeWriter::VisitObjCObjectPointerType(const ObjCObjectPointerType *T) {<br class="">
> - Writer.AddTypeRef(T->getPointeeType(), Record);<br class="">
> + Record.AddTypeRef(T->getPointeeType());<br class="">
> Code = TYPE_OBJC_OBJECT_POINTER;<br class="">
> }<br class="">
><br class="">
> void<br class="">
> ASTTypeWriter::VisitAtomicType(const AtomicType *T) {<br class="">
> - Writer.AddTypeRef(T->getValueType(), Record);<br class="">
> + Record.AddTypeRef(T->getValueType());<br class="">
> Code = TYPE_ATOMIC;<br class="">
> }<br class="">
><br class="">
> void<br class="">
> ASTTypeWriter::VisitPipeType(const PipeType *T) {<br class="">
> - Writer.AddTypeRef(T->getElementType(), Record);<br class="">
> + Record.AddTypeRef(T->getElementType());<br class="">
> Code = TYPE_PIPE;<br class="">
> }<br class="">
><br class="">
> @@ -463,11 +462,11 @@ namespace {<br class="">
><br class="">
> class TypeLocWriter : public TypeLocVisitor<TypeLocWriter> {<br class="">
> ASTWriter &Writer;<br class="">
> - ASTWriter::RecordDataImpl &Record;<br class="">
> + ASTRecordWriter Record;<br class="">
><br class="">
> public:<br class="">
> TypeLocWriter(ASTWriter &Writer, ASTWriter::RecordDataImpl &Record)<br class="">
> - : Writer(Writer), Record(Record) { }<br class="">
> + : Writer(Writer), Record(Writer, Record) { }<br class="">
><br class="">
> #define ABSTRACT_TYPELOC(CLASS, PARENT)<br class="">
> #define TYPELOC(CLASS, PARENT) \<br class="">
> @@ -484,7 +483,7 @@ void TypeLocWriter::VisitQualifiedTypeLo<br class="">
> // nothing to do<br class="">
> }<br class="">
> void TypeLocWriter::VisitBuiltinTypeLoc(BuiltinTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getBuiltinLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getBuiltinLoc());<br class="">
> if (TL.needsExtraLocalData()) {<br class="">
> Record.push_back(TL.getWrittenTypeSpec());<br class="">
> Record.push_back(TL.getWrittenSignSpec());<br class="">
> @@ -493,10 +492,10 @@ void TypeLocWriter::VisitBuiltinTypeLoc(<br class="">
> }<br class="">
> }<br class="">
> void TypeLocWriter::VisitComplexTypeLoc(ComplexTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitPointerTypeLoc(PointerTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getStarLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getStarLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitDecayedTypeLoc(DecayedTypeLoc TL) {<br class="">
> // nothing to do<br class="">
> @@ -505,21 +504,21 @@ void TypeLocWriter::VisitAdjustedTypeLoc<br class="">
> // nothing to do<br class="">
> }<br class="">
> void TypeLocWriter::VisitBlockPointerTypeLoc(BlockPointerTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getCaretLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getCaretLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitLValueReferenceTypeLoc(LValueReferenceTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getAmpLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getAmpLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitRValueReferenceTypeLoc(RValueReferenceTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getAmpAmpLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getAmpAmpLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitMemberPointerTypeLoc(MemberPointerTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getStarLoc(), Record);<br class="">
> - Writer.AddTypeSourceInfo(TL.getClassTInfo(), Record);<br class="">
> + Record.AddSourceLocation(TL.getStarLoc());<br class="">
> + Record.AddTypeSourceInfo(TL.getClassTInfo());<br class="">
> }<br class="">
> void TypeLocWriter::VisitArrayTypeLoc(ArrayTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getLBracketLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getRBracketLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getLBracketLoc());<br class="">
> + Record.AddSourceLocation(TL.getRBracketLoc());<br class="">
> Record.push_back(TL.getSizeExpr() ? 1 : 0);<br class="">
> if (TL.getSizeExpr())<br class="">
> Writer.AddStmt(TL.getSizeExpr());<br class="">
> @@ -539,21 +538,21 @@ void TypeLocWriter::VisitDependentSizedA<br class="">
> }<br class="">
> void TypeLocWriter::VisitDependentSizedExtVectorTypeLoc(<br class="">
> DependentSizedExtVectorTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitVectorTypeLoc(VectorTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitExtVectorTypeLoc(ExtVectorTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitFunctionTypeLoc(FunctionTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getLocalRangeBegin(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getLParenLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getRParenLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getLocalRangeEnd(), Record);<br class="">
> + Record.AddSourceLocation(TL.getLocalRangeBegin());<br class="">
> + Record.AddSourceLocation(TL.getLParenLoc());<br class="">
> + Record.AddSourceLocation(TL.getRParenLoc());<br class="">
> + Record.AddSourceLocation(TL.getLocalRangeEnd());<br class="">
> for (unsigned i = 0, e = TL.getNumParams(); i != e; ++i)<br class="">
> - Writer.AddDeclRef(TL.getParam(i), Record);<br class="">
> + Record.AddDeclRef(TL.getParam(i));<br class="">
> }<br class="">
> void TypeLocWriter::VisitFunctionProtoTypeLoc(FunctionProtoTypeLoc TL) {<br class="">
> VisitFunctionTypeLoc(TL);<br class="">
> @@ -562,131 +561,131 @@ void TypeLocWriter::VisitFunctionNoProto<br class="">
> VisitFunctionTypeLoc(TL);<br class="">
> }<br class="">
> void TypeLocWriter::VisitUnresolvedUsingTypeLoc(UnresolvedUsingTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitTypedefTypeLoc(TypedefTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitTypeOfExprTypeLoc(TypeOfExprTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getTypeofLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getLParenLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getRParenLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getTypeofLoc());<br class="">
> + Record.AddSourceLocation(TL.getLParenLoc());<br class="">
> + Record.AddSourceLocation(TL.getRParenLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitTypeOfTypeLoc(TypeOfTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getTypeofLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getLParenLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getRParenLoc(), Record);<br class="">
> - Writer.AddTypeSourceInfo(TL.getUnderlyingTInfo(), Record);<br class="">
> + Record.AddSourceLocation(TL.getTypeofLoc());<br class="">
> + Record.AddSourceLocation(TL.getLParenLoc());<br class="">
> + Record.AddSourceLocation(TL.getRParenLoc());<br class="">
> + Record.AddTypeSourceInfo(TL.getUnderlyingTInfo());<br class="">
> }<br class="">
> void TypeLocWriter::VisitDecltypeTypeLoc(DecltypeTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitUnaryTransformTypeLoc(UnaryTransformTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getKWLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getLParenLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getRParenLoc(), Record);<br class="">
> - Writer.AddTypeSourceInfo(TL.getUnderlyingTInfo(), Record);<br class="">
> + Record.AddSourceLocation(TL.getKWLoc());<br class="">
> + Record.AddSourceLocation(TL.getLParenLoc());<br class="">
> + Record.AddSourceLocation(TL.getRParenLoc());<br class="">
> + Record.AddTypeSourceInfo(TL.getUnderlyingTInfo());<br class="">
> }<br class="">
> void TypeLocWriter::VisitAutoTypeLoc(AutoTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitRecordTypeLoc(RecordTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitEnumTypeLoc(EnumTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitAttributedTypeLoc(AttributedTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getAttrNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getAttrNameLoc());<br class="">
> if (TL.hasAttrOperand()) {<br class="">
> SourceRange range = TL.getAttrOperandParensRange();<br class="">
> - Writer.AddSourceLocation(range.getBegin(), Record);<br class="">
> - Writer.AddSourceLocation(range.getEnd(), Record);<br class="">
> + Record.AddSourceLocation(range.getBegin());<br class="">
> + Record.AddSourceLocation(range.getEnd());<br class="">
> }<br class="">
> if (TL.hasAttrExprOperand()) {<br class="">
> Expr *operand = TL.getAttrExprOperand();<br class="">
> Record.push_back(operand ? 1 : 0);<br class="">
> if (operand) Writer.AddStmt(operand);<br class="">
> } else if (TL.hasAttrEnumOperand()) {<br class="">
> - Writer.AddSourceLocation(TL.getAttrEnumOperandLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getAttrEnumOperandLoc());<br class="">
> }<br class="">
> }<br class="">
> void TypeLocWriter::VisitTemplateTypeParmTypeLoc(TemplateTypeParmTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitSubstTemplateTypeParmTypeLoc(<br class="">
> SubstTemplateTypeParmTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitSubstTemplateTypeParmPackTypeLoc(<br class="">
> SubstTemplateTypeParmPackTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitTemplateSpecializationTypeLoc(<br class="">
> TemplateSpecializationTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getTemplateKeywordLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getTemplateNameLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getLAngleLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getRAngleLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getTemplateKeywordLoc());<br class="">
> + Record.AddSourceLocation(TL.getTemplateNameLoc());<br class="">
> + Record.AddSourceLocation(TL.getLAngleLoc());<br class="">
> + Record.AddSourceLocation(TL.getRAngleLoc());<br class="">
> for (unsigned i = 0, e = TL.getNumArgs(); i != e; ++i)<br class="">
> - Writer.AddTemplateArgumentLocInfo(TL.getArgLoc(i).getArgument().getKind(),<br class="">
> - TL.getArgLoc(i).getLocInfo(), Record);<br class="">
> + Record.AddTemplateArgumentLocInfo(TL.getArgLoc(i).getArgument().getKind(),<br class="">
> + TL.getArgLoc(i).getLocInfo());<br class="">
> }<br class="">
> void TypeLocWriter::VisitParenTypeLoc(ParenTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getLParenLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getRParenLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getLParenLoc());<br class="">
> + Record.AddSourceLocation(TL.getRParenLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitElaboratedTypeLoc(ElaboratedTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getElaboratedKeywordLoc(), Record);<br class="">
> - Writer.AddNestedNameSpecifierLoc(TL.getQualifierLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getElaboratedKeywordLoc());<br class="">
> + Record.AddNestedNameSpecifierLoc(TL.getQualifierLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitInjectedClassNameTypeLoc(InjectedClassNameTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitDependentNameTypeLoc(DependentNameTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getElaboratedKeywordLoc(), Record);<br class="">
> - Writer.AddNestedNameSpecifierLoc(TL.getQualifierLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getElaboratedKeywordLoc());<br class="">
> + Record.AddNestedNameSpecifierLoc(TL.getQualifierLoc());<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitDependentTemplateSpecializationTypeLoc(<br class="">
> DependentTemplateSpecializationTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getElaboratedKeywordLoc(), Record);<br class="">
> - Writer.AddNestedNameSpecifierLoc(TL.getQualifierLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getTemplateKeywordLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getTemplateNameLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getLAngleLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getRAngleLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getElaboratedKeywordLoc());<br class="">
> + Record.AddNestedNameSpecifierLoc(TL.getQualifierLoc());<br class="">
> + Record.AddSourceLocation(TL.getTemplateKeywordLoc());<br class="">
> + Record.AddSourceLocation(TL.getTemplateNameLoc());<br class="">
> + Record.AddSourceLocation(TL.getLAngleLoc());<br class="">
> + Record.AddSourceLocation(TL.getRAngleLoc());<br class="">
> for (unsigned I = 0, E = TL.getNumArgs(); I != E; ++I)<br class="">
> - Writer.AddTemplateArgumentLocInfo(TL.getArgLoc(I).getArgument().getKind(),<br class="">
> - TL.getArgLoc(I).getLocInfo(), Record);<br class="">
> + Record.AddTemplateArgumentLocInfo(TL.getArgLoc(I).getArgument().getKind(),<br class="">
> + TL.getArgLoc(I).getLocInfo());<br class="">
> }<br class="">
> void TypeLocWriter::VisitPackExpansionTypeLoc(PackExpansionTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getEllipsisLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getEllipsisLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitObjCInterfaceTypeLoc(ObjCInterfaceTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getNameLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getNameLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitObjCObjectTypeLoc(ObjCObjectTypeLoc TL) {<br class="">
> Record.push_back(TL.hasBaseTypeAsWritten());<br class="">
> - Writer.AddSourceLocation(TL.getTypeArgsLAngleLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getTypeArgsRAngleLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getTypeArgsLAngleLoc());<br class="">
> + Record.AddSourceLocation(TL.getTypeArgsRAngleLoc());<br class="">
> for (unsigned i = 0, e = TL.getNumTypeArgs(); i != e; ++i)<br class="">
> - Writer.AddTypeSourceInfo(TL.getTypeArgTInfo(i), Record);<br class="">
> - Writer.AddSourceLocation(TL.getProtocolLAngleLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getProtocolRAngleLoc(), Record);<br class="">
> + Record.AddTypeSourceInfo(TL.getTypeArgTInfo(i));<br class="">
> + Record.AddSourceLocation(TL.getProtocolLAngleLoc());<br class="">
> + Record.AddSourceLocation(TL.getProtocolRAngleLoc());<br class="">
> for (unsigned i = 0, e = TL.getNumProtocols(); i != e; ++i)<br class="">
> - Writer.AddSourceLocation(TL.getProtocolLoc(i), Record);<br class="">
> + Record.AddSourceLocation(TL.getProtocolLoc(i));<br class="">
> }<br class="">
> void TypeLocWriter::VisitObjCObjectPointerTypeLoc(ObjCObjectPointerTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getStarLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getStarLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitAtomicTypeLoc(AtomicTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getKWLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getLParenLoc(), Record);<br class="">
> - Writer.AddSourceLocation(TL.getRParenLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getKWLoc());<br class="">
> + Record.AddSourceLocation(TL.getLParenLoc());<br class="">
> + Record.AddSourceLocation(TL.getRParenLoc());<br class="">
> }<br class="">
> void TypeLocWriter::VisitPipeTypeLoc(PipeTypeLoc TL) {<br class="">
> - Writer.AddSourceLocation(TL.getKWLoc(), Record);<br class="">
> + Record.AddSourceLocation(TL.getKWLoc());<br class="">
> }<br class="">
><br class="">
> void ASTWriter::WriteTypeAbbrevs() {<br class="">
> @@ -3989,9 +3988,9 @@ void ASTWriter::WriteModuleFileExtension<br class="">
> // General Serialization Routines<br class="">
> //===----------------------------------------------------------------------===//<br class="">
><br class="">
> -/// \brief Write a record containing the given attributes.<br class="">
> -void ASTWriter::WriteAttributes(ArrayRef<const Attr*> Attrs,<br class="">
> - RecordDataImpl &Record) {<br class="">
> +/// \brief Emit the list of attributes to the specified record.<br class="">
> +void ASTWriter::AddAttributes(ArrayRef<const Attr *> Attrs,<br class="">
> + RecordDataImpl &Record) {<br class="">
> Record.push_back(Attrs.size());<br class="">
> for (const auto *A : Attrs) {<br class="">
> Record.push_back(A->getKind()); // FIXME: stable encoding, target attrs<br class="">
> @@ -4656,11 +4655,18 @@ void ASTWriter::WriteDeclUpdatesBlocks(R<br class="">
> const Decl *D = DeclUpdate.first;<br class="">
><br class="">
> bool HasUpdatedBody = false;<br class="">
> - RecordData Record;<br class="">
> + RecordData RecordData;<br class="">
> + ASTRecordWriter Record(*this, RecordData);<br class="">
> for (auto &Update : DeclUpdate.second) {<br class="">
> DeclUpdateKind Kind = (DeclUpdateKind)Update.getKind();<br class="">
><br class="">
> - Record.push_back(Kind);<br class="">
> + // An updated body is emitted last, so that the reader doesn't need<br class="">
> + // to skip over the lazy body to reach statements for other records.<br class="">
> + if (Kind == UPD_CXX_ADDED_FUNCTION_DEFINITION)<br class="">
> + HasUpdatedBody = true;<br class="">
> + else<br class="">
> + Record.push_back(Kind);<br class="">
> +<br class="">
> switch (Kind) {<br class="">
> case UPD_CXX_ADDED_IMPLICIT_MEMBER:<br class="">
> case UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION:<br class="">
> @@ -4670,14 +4676,10 @@ void ASTWriter::WriteDeclUpdatesBlocks(R<br class="">
> break;<br class="">
><br class="">
> case UPD_CXX_ADDED_FUNCTION_DEFINITION:<br class="">
> - // An updated body is emitted last, so that the reader doesn't need<br class="">
> - // to skip over the lazy body to reach statements for other records.<br class="">
> - Record.pop_back();<br class="">
> - HasUpdatedBody = true;<br class="">
> break;<br class="">
><br class="">
> case UPD_CXX_INSTANTIATED_STATIC_DATA_MEMBER:<br class="">
> - AddSourceLocation(Update.getLoc(), Record);<br class="">
> + Record.AddSourceLocation(Update.getLoc());<br class="">
> break;<br class="">
><br class="">
> case UPD_CXX_INSTANTIATED_DEFAULT_ARGUMENT:<br class="">
> @@ -4688,7 +4690,7 @@ void ASTWriter::WriteDeclUpdatesBlocks(R<br class="">
> case UPD_CXX_INSTANTIATED_CLASS_DEFINITION: {<br class="">
> auto *RD = cast<CXXRecordDecl>(D);<br class="">
> UpdatedDeclContexts.insert(RD->getPrimaryContext());<br class="">
> - AddCXXDefinitionData(RD, Record);<br class="">
> + Record.AddCXXDefinitionData(RD);<br class="">
> Record.push_back(WriteDeclContextLexicalBlock(<br class="">
> *Context, const_cast<CXXRecordDecl *>(RD)));<br class="">
><br class="">
> @@ -4697,11 +4699,11 @@ void ASTWriter::WriteDeclUpdatesBlocks(R<br class="">
> // to it referring to the template definition.<br class="">
> if (auto *MSInfo = RD->getMemberSpecializationInfo()) {<br class="">
> Record.push_back(MSInfo->getTemplateSpecializationKind());<br class="">
> - AddSourceLocation(MSInfo->getPointOfInstantiation(), Record);<br class="">
> + Record.AddSourceLocation(MSInfo->getPointOfInstantiation());<br class="">
> } else {<br class="">
> auto *Spec = cast<ClassTemplateSpecializationDecl>(RD);<br class="">
> Record.push_back(Spec->getTemplateSpecializationKind());<br class="">
> - AddSourceLocation(Spec->getPointOfInstantiation(), Record);<br class="">
> + Record.AddSourceLocation(Spec->getPointOfInstantiation());<br class="">
><br class="">
> // The instantiation might have been resolved to a partial<br class="">
> // specialization. If so, record which one.<br class="">
> @@ -4709,30 +4711,29 @@ void ASTWriter::WriteDeclUpdatesBlocks(R<br class="">
> if (auto PartialSpec =<br class="">
> From.dyn_cast<ClassTemplatePartialSpecializationDecl*>()) {<br class="">
> Record.push_back(true);<br class="">
> - AddDeclRef(PartialSpec, Record);<br class="">
> - AddTemplateArgumentList(&Spec->getTemplateInstantiationArgs(),<br class="">
> - Record);<br class="">
> + Record.AddDeclRef(PartialSpec);<br class="">
> + Record.AddTemplateArgumentList(<br class="">
> + &Spec->getTemplateInstantiationArgs());<br class="">
> } else {<br class="">
> Record.push_back(false);<br class="">
> }<br class="">
> }<br class="">
> Record.push_back(RD->getTagKind());<br class="">
> - AddSourceLocation(RD->getLocation(), Record);<br class="">
> - AddSourceLocation(RD->getLocStart(), Record);<br class="">
> - AddSourceLocation(RD->getRBraceLoc(), Record);<br class="">
> + Record.AddSourceLocation(RD->getLocation());<br class="">
> + Record.AddSourceLocation(RD->getLocStart());<br class="">
> + Record.AddSourceLocation(RD->getRBraceLoc());<br class="">
><br class="">
> // Instantiation may change attributes; write them all out afresh.<br class="">
> Record.push_back(D->hasAttrs());<br class="">
> - if (Record.back())<br class="">
> - WriteAttributes(llvm::makeArrayRef(D->getAttrs().begin(),<br class="">
> - D->getAttrs().size()), Record);<br class="">
> + if (D->hasAttrs())<br class="">
> + Record.AddAttributes(D->getAttrs());<br class="">
><br class="">
> // FIXME: Ensure we don't get here for explicit instantiations.<br class="">
> break;<br class="">
> }<br class="">
><br class="">
> case UPD_CXX_RESOLVED_DTOR_DELETE:<br class="">
> - AddDeclRef(Update.getDecl(), Record);<br class="">
> + Record.AddDeclRef(Update.getDecl());<br class="">
> break;<br class="">
><br class="">
> case UPD_CXX_RESOLVED_EXCEPTION_SPEC:<br class="">
> @@ -4755,8 +4756,8 @@ void ASTWriter::WriteDeclUpdatesBlocks(R<br class="">
> break;<br class="">
><br class="">
> case UPD_DECL_MARKED_OPENMP_THREADPRIVATE:<br class="">
> - AddSourceRange(D->getAttr<OMPThreadPrivateDeclAttr>()->getRange(),<br class="">
> - Record);<br class="">
> + Record.AddSourceRange(<br class="">
> + D->getAttr<OMPThreadPrivateDeclAttr>()->getRange());<br class="">
> break;<br class="">
><br class="">
> case UPD_DECL_EXPORTED:<br class="">
> @@ -4764,7 +4765,7 @@ void ASTWriter::WriteDeclUpdatesBlocks(R<br class="">
> break;<br class="">
><br class="">
> case UPD_ADDED_ATTR_TO_RECORD:<br class="">
> - WriteAttributes(llvm::makeArrayRef(Update.getAttr()), Record);<br class="">
> + Record.AddAttributes(llvm::makeArrayRef(Update.getAttr()));<br class="">
> break;<br class="">
> }<br class="">
> }<br class="">
> @@ -4773,14 +4774,12 @@ void ASTWriter::WriteDeclUpdatesBlocks(R<br class="">
> const auto *Def = cast<FunctionDecl>(D);<br class="">
> Record.push_back(UPD_CXX_ADDED_FUNCTION_DEFINITION);<br class="">
> Record.push_back(Def->isInlined());<br class="">
> - AddSourceLocation(Def->getInnerLocStart(), Record);<br class="">
> - AddFunctionDefinition(Def, Record);<br class="">
> + Record.AddSourceLocation(Def->getInnerLocStart());<br class="">
> + AddFunctionDefinition(Def, Record.getRecordData());<br class="">
> }<br class="">
><br class="">
> OffsetsRecord.push_back(GetDeclRef(D));<br class="">
> - OffsetsRecord.push_back(Stream.GetCurrentBitNo());<br class="">
> -<br class="">
> - Stream.EmitRecord(DECL_UPDATES, Record);<br class="">
> + OffsetsRecord.push_back(Record.Emit(DECL_UPDATES));<br class="">
><br class="">
> FlushPendingAfterDecl();<br class="">
> }<br class="">
><br class="">
> Modified: cfe/trunk/lib/Serialization/ASTWriterDecl.cpp<br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterDecl.cpp?rev=265195&r1=265194&r2=265195&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterDecl.cpp?rev=265195&r1=265194&r2=265195&view=diff</a><br class="">
> ==============================================================================<br class="">
> --- cfe/trunk/lib/Serialization/ASTWriterDecl.cpp (original)<br class="">
> +++ cfe/trunk/lib/Serialization/ASTWriterDecl.cpp Fri Apr 1 17:52:03 2016<br class="">
> @@ -32,18 +32,31 @@ using namespace serialization;<br class="">
><br class="">
> namespace clang {<br class="">
> class ASTDeclWriter : public DeclVisitor<ASTDeclWriter, void> {<br class="">
> -<br class="">
> ASTWriter &Writer;<br class="">
> ASTContext &Context;<br class="">
> - typedef ASTWriter::RecordData RecordData;<br class="">
> - RecordData &Record;<br class="">
> + ASTRecordWriter Record;<br class="">
><br class="">
> - public:<br class="">
> serialization::DeclCode Code;<br class="">
> unsigned AbbrevToUse;<br class="">
><br class="">
> - ASTDeclWriter(ASTWriter &Writer, ASTContext &Context, RecordData &Record)<br class="">
> - : Writer(Writer), Context(Context), Record(Record) {<br class="">
> + public:<br class="">
> + ASTDeclWriter(ASTWriter &Writer, ASTContext &Context,<br class="">
> + ASTWriter::RecordDataImpl &Record)<br class="">
> + : Writer(Writer), Context(Context), Record(Writer, Record),<br class="">
> + Code((serialization::DeclCode)0), AbbrevToUse(0) {}<br class="">
> +<br class="">
> + uint64_t Emit(Decl *D) {<br class="">
> + if (!Code)<br class="">
> + llvm::report_fatal_error(StringRef("unexpected declaration kind '") +<br class="">
> + D->getDeclKindName() + "'");<br class="">
> +<br class="">
> + auto Offset = Record.Emit(Code, AbbrevToUse);<br class="">
> +<br class="">
> + // Flush any expressions, base specifiers, and ctor initializers that<br class="">
> + // were written as part of this declaration.<br class="">
> + Writer.FlushPendingAfterDecl();<br class="">
> +<br class="">
> + return Offset;<br class="">
> }<br class="">
><br class="">
> void Visit(Decl *D);<br class="">
> @@ -152,10 +165,10 @@ namespace clang {<br class="">
><br class="">
> Record.push_back(typeParams->size());<br class="">
> for (auto typeParam : *typeParams) {<br class="">
> - Writer.AddDeclRef(typeParam, Record);<br class="">
> + Record.AddDeclRef(typeParam);<br class="">
> }<br class="">
> - Writer.AddSourceLocation(typeParams->getLAngleLoc(), Record);<br class="">
> - Writer.AddSourceLocation(typeParams->getRAngleLoc(), Record);<br class="">
> + Record.AddSourceLocation(typeParams->getLAngleLoc());<br class="">
> + Record.AddSourceLocation(typeParams->getRAngleLoc());<br class="">
> }<br class="">
><br class="">
> void AddFunctionDefinition(const FunctionDecl *FD) {<br class="">
> @@ -163,8 +176,8 @@ namespace clang {<br class="">
> if (auto *CD = dyn_cast<CXXConstructorDecl>(FD)) {<br class="">
> Record.push_back(CD->NumCtorInitializers);<br class="">
> if (CD->NumCtorInitializers)<br class="">
> - Writer.AddCXXCtorInitializersRef(<br class="">
> - llvm::makeArrayRef(CD->init_begin(), CD->init_end()), Record);<br class="">
> + Record.AddCXXCtorInitializersRef(<br class="">
> + llvm::makeArrayRef(CD->init_begin(), CD->init_end()));<br class="">
> }<br class="">
> Writer.AddStmt(FD->getBody());<br class="">
> }<br class="">
> @@ -182,7 +195,7 @@ namespace clang {<br class="">
> Firsts[nullptr] = R;<br class="">
> }<br class="">
> for (const auto &F : Firsts)<br class="">
> - Writer.AddDeclRef(F.second, Record);<br class="">
> + Record.AddDeclRef(F.second);<br class="">
> }<br class="">
><br class="">
> /// Get the specialization decl from an entry in the specialization list.<br class="">
> @@ -271,7 +284,7 @@ void ASTDeclWriter::Visit(Decl *D) {<br class="">
> // abbreviation infrastructure requires that arrays are encoded last, so<br class="">
> // we handle it here in the case of those classes derived from DeclaratorDecl<br class="">
> if (DeclaratorDecl *DD = dyn_cast<DeclaratorDecl>(D)) {<br class="">
> - Writer.AddTypeSourceInfo(DD->getTypeSourceInfo(), Record);<br class="">
> + Record.AddTypeSourceInfo(DD->getTypeSourceInfo());<br class="">
> }<br class="">
><br class="">
> // Handle FunctionDecl's body here and write it after all other Stmts/Exprs<br class="">
> @@ -285,16 +298,15 @@ void ASTDeclWriter::Visit(Decl *D) {<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitDecl(Decl *D) {<br class="">
> - Writer.AddDeclRef(cast_or_null<Decl>(D->getDeclContext()), Record);<br class="">
> + Record.AddDeclRef(cast_or_null<Decl>(D->getDeclContext()));<br class="">
> if (D->getDeclContext() != D->getLexicalDeclContext())<br class="">
> - Writer.AddDeclRef(cast_or_null<Decl>(D->getLexicalDeclContext()), Record);<br class="">
> + Record.AddDeclRef(cast_or_null<Decl>(D->getLexicalDeclContext()));<br class="">
> else<br class="">
> Record.push_back(0);<br class="">
> Record.push_back(D->isInvalidDecl());<br class="">
> Record.push_back(D->hasAttrs());<br class="">
> if (D->hasAttrs())<br class="">
> - Writer.WriteAttributes(llvm::makeArrayRef(D->getAttrs().begin(),<br class="">
> - D->getAttrs().size()), Record);<br class="">
> + Record.AddAttributes(D->getAttrs());<br class="">
> Record.push_back(D->isImplicit());<br class="">
> Record.push_back(D->isUsed(false));<br class="">
> Record.push_back(D->isReferenced());<br class="">
> @@ -328,9 +340,9 @@ void ASTDeclWriter::VisitPragmaCommentDe<br class="">
> StringRef Arg = D->getArg();<br class="">
> Record.push_back(Arg.size());<br class="">
> VisitDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getLocStart(), Record);<br class="">
> + Record.AddSourceLocation(D->getLocStart());<br class="">
> Record.push_back(D->getCommentKind());<br class="">
> - Writer.AddString(Arg, Record);<br class="">
> + Record.AddString(Arg);<br class="">
> Code = serialization::DECL_PRAGMA_COMMENT;<br class="">
> }<br class="">
><br class="">
> @@ -340,9 +352,9 @@ void ASTDeclWriter::VisitPragmaDetectMis<br class="">
> StringRef Value = D->getValue();<br class="">
> Record.push_back(Name.size() + 1 + Value.size());<br class="">
> VisitDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getLocStart(), Record);<br class="">
> - Writer.AddString(Name, Record);<br class="">
> - Writer.AddString(Value, Record);<br class="">
> + Record.AddSourceLocation(D->getLocStart());<br class="">
> + Record.AddString(Name);<br class="">
> + Record.AddString(Value);<br class="">
> Code = serialization::DECL_PRAGMA_DETECT_MISMATCH;<br class="">
> }<br class="">
><br class="">
> @@ -352,7 +364,7 @@ void ASTDeclWriter::VisitTranslationUnit<br class="">
><br class="">
> void ASTDeclWriter::VisitNamedDecl(NamedDecl *D) {<br class="">
> VisitDecl(D);<br class="">
> - Writer.AddDeclarationName(D->getDeclName(), Record);<br class="">
> + Record.AddDeclarationName(D->getDeclName());<br class="">
> Record.push_back(needsAnonymousDeclarationNumber(D)<br class="">
> ? Writer.getAnonymousDeclarationNumber(D)<br class="">
> : 0);<br class="">
> @@ -360,17 +372,17 @@ void ASTDeclWriter::VisitNamedDecl(Named<br class="">
><br class="">
> void ASTDeclWriter::VisitTypeDecl(TypeDecl *D) {<br class="">
> VisitNamedDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getLocStart(), Record);<br class="">
> - Writer.AddTypeRef(QualType(D->getTypeForDecl(), 0), Record);<br class="">
> + Record.AddSourceLocation(D->getLocStart());<br class="">
> + Record.AddTypeRef(QualType(D->getTypeForDecl(), 0));<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitTypedefNameDecl(TypedefNameDecl *D) {<br class="">
> VisitRedeclarable(D);<br class="">
> VisitTypeDecl(D);<br class="">
> - Writer.AddTypeSourceInfo(D->getTypeSourceInfo(), Record);<br class="">
> + Record.AddTypeSourceInfo(D->getTypeSourceInfo());<br class="">
> Record.push_back(D->isModed());<br class="">
> if (D->isModed())<br class="">
> - Writer.AddTypeRef(D->getUnderlyingType(), Record);<br class="">
> + Record.AddTypeRef(D->getUnderlyingType());<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitTypedefDecl(TypedefDecl *D) {<br class="">
> @@ -391,7 +403,7 @@ void ASTDeclWriter::VisitTypedefDecl(Typ<br class="">
><br class="">
> void ASTDeclWriter::VisitTypeAliasDecl(TypeAliasDecl *D) {<br class="">
> VisitTypedefNameDecl(D);<br class="">
> - Writer.AddDeclRef(D->getDescribedAliasTemplate(), Record);<br class="">
> + Record.AddDeclRef(D->getDescribedAliasTemplate());<br class="">
> Code = serialization::DECL_TYPEALIAS;<br class="">
> }<br class="">
><br class="">
> @@ -405,15 +417,15 @@ void ASTDeclWriter::VisitTagDecl(TagDecl<br class="">
> Record.push_back(D->isEmbeddedInDeclarator());<br class="">
> Record.push_back(D->isFreeStanding());<br class="">
> Record.push_back(D->isCompleteDefinitionRequired());<br class="">
> - Writer.AddSourceLocation(D->getRBraceLoc(), Record);<br class="">
> + Record.AddSourceLocation(D->getRBraceLoc());<br class="">
><br class="">
> if (D->hasExtInfo()) {<br class="">
> Record.push_back(1);<br class="">
> - Writer.AddQualifierInfo(*D->getExtInfo(), Record);<br class="">
> + Record.AddQualifierInfo(*D->getExtInfo());<br class="">
> } else if (auto *TD = D->getTypedefNameForAnonDecl()) {<br class="">
> Record.push_back(2);<br class="">
> - Writer.AddDeclRef(TD, Record);<br class="">
> - Writer.AddIdentifierRef(TD->getDeclName().getAsIdentifierInfo(), Record);<br class="">
> + Record.AddDeclRef(TD);<br class="">
> + Record.AddIdentifierRef(TD->getDeclName().getAsIdentifierInfo());<br class="">
> } else {<br class="">
> Record.push_back(0);<br class="">
> }<br class="">
> @@ -421,21 +433,21 @@ void ASTDeclWriter::VisitTagDecl(TagDecl<br class="">
><br class="">
> void ASTDeclWriter::VisitEnumDecl(EnumDecl *D) {<br class="">
> VisitTagDecl(D);<br class="">
> - Writer.AddTypeSourceInfo(D->getIntegerTypeSourceInfo(), Record);<br class="">
> + Record.AddTypeSourceInfo(D->getIntegerTypeSourceInfo());<br class="">
> if (!D->getIntegerTypeSourceInfo())<br class="">
> - Writer.AddTypeRef(D->getIntegerType(), Record);<br class="">
> - Writer.AddTypeRef(D->getPromotionType(), Record);<br class="">
> + Record.AddTypeRef(D->getIntegerType());<br class="">
> + Record.AddTypeRef(D->getPromotionType());<br class="">
> Record.push_back(D->getNumPositiveBits());<br class="">
> Record.push_back(D->getNumNegativeBits());<br class="">
> Record.push_back(D->isScoped());<br class="">
> Record.push_back(D->isScopedUsingClassTag());<br class="">
> Record.push_back(D->isFixed());<br class="">
> if (MemberSpecializationInfo *MemberInfo = D->getMemberSpecializationInfo()) {<br class="">
> - Writer.AddDeclRef(MemberInfo->getInstantiatedFrom(), Record);<br class="">
> + Record.AddDeclRef(MemberInfo->getInstantiatedFrom());<br class="">
> Record.push_back(MemberInfo->getTemplateSpecializationKind());<br class="">
> - Writer.AddSourceLocation(MemberInfo->getPointOfInstantiation(), Record);<br class="">
> + Record.AddSourceLocation(MemberInfo->getPointOfInstantiation());<br class="">
> } else {<br class="">
> - Writer.AddDeclRef(nullptr, Record);<br class="">
> + Record.AddDeclRef(nullptr);<br class="">
> }<br class="">
><br class="">
> if (D->getDeclContext() == D->getLexicalDeclContext() &&<br class="">
> @@ -489,7 +501,7 @@ void ASTDeclWriter::VisitRecordDecl(Reco<br class="">
><br class="">
> void ASTDeclWriter::VisitValueDecl(ValueDecl *D) {<br class="">
> VisitNamedDecl(D);<br class="">
> - Writer.AddTypeRef(D->getType(), Record);<br class="">
> + Record.AddTypeRef(D->getType());<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitEnumConstantDecl(EnumConstantDecl *D) {<br class="">
> @@ -497,23 +509,23 @@ void ASTDeclWriter::VisitEnumConstantDec<br class="">
> Record.push_back(D->getInitExpr()? 1 : 0);<br class="">
> if (D->getInitExpr())<br class="">
> Writer.AddStmt(D->getInitExpr());<br class="">
> - Writer.AddAPSInt(D->getInitVal(), Record);<br class="">
> + Record.AddAPSInt(D->getInitVal());<br class="">
><br class="">
> Code = serialization::DECL_ENUM_CONSTANT;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitDeclaratorDecl(DeclaratorDecl *D) {<br class="">
> VisitValueDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getInnerLocStart(), Record);<br class="">
> + Record.AddSourceLocation(D->getInnerLocStart());<br class="">
> Record.push_back(D->hasExtInfo());<br class="">
> if (D->hasExtInfo())<br class="">
> - Writer.AddQualifierInfo(*D->getExtInfo(), Record);<br class="">
> + Record.AddQualifierInfo(*D->getExtInfo());<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitFunctionDecl(FunctionDecl *D) {<br class="">
> VisitRedeclarable(D);<br class="">
> VisitDeclaratorDecl(D);<br class="">
> - Writer.AddDeclarationNameLoc(D->DNLoc, D->getDeclName(), Record);<br class="">
> + Record.AddDeclarationNameLoc(D->DNLoc, D->getDeclName());<br class="">
> Record.push_back(D->getIdentifierNamespace());<br class="">
><br class="">
> // FunctionDecl's body is handled last at ASTWriterDecl::Visit,<br class="">
> @@ -535,20 +547,20 @@ void ASTDeclWriter::VisitFunctionDecl(Fu<br class="">
> Record.push_back(D->HasSkippedBody);<br class="">
> Record.push_back(D->IsLateTemplateParsed);<br class="">
> Record.push_back(D->getLinkageInternal());<br class="">
> - Writer.AddSourceLocation(D->getLocEnd(), Record);<br class="">
> + Record.AddSourceLocation(D->getLocEnd());<br class="">
><br class="">
> Record.push_back(D->getTemplatedKind());<br class="">
> switch (D->getTemplatedKind()) {<br class="">
> case FunctionDecl::TK_NonTemplate:<br class="">
> break;<br class="">
> case FunctionDecl::TK_FunctionTemplate:<br class="">
> - Writer.AddDeclRef(D->getDescribedFunctionTemplate(), Record);<br class="">
> + Record.AddDeclRef(D->getDescribedFunctionTemplate());<br class="">
> break;<br class="">
> case FunctionDecl::TK_MemberSpecialization: {<br class="">
> MemberSpecializationInfo *MemberInfo = D->getMemberSpecializationInfo();<br class="">
> - Writer.AddDeclRef(MemberInfo->getInstantiatedFrom(), Record);<br class="">
> + Record.AddDeclRef(MemberInfo->getInstantiatedFrom());<br class="">
> Record.push_back(MemberInfo->getTemplateSpecializationKind());<br class="">
> - Writer.AddSourceLocation(MemberInfo->getPointOfInstantiation(), Record);<br class="">
> + Record.AddSourceLocation(MemberInfo->getPointOfInstantiation());<br class="">
> break;<br class="">
> }<br class="">
> case FunctionDecl::TK_FunctionTemplateSpecialization: {<br class="">
> @@ -557,11 +569,11 @@ void ASTDeclWriter::VisitFunctionDecl(Fu<br class="">
><br class="">
> RegisterTemplateSpecialization(FTSInfo->getTemplate(), D);<br class="">
><br class="">
> - Writer.AddDeclRef(FTSInfo->getTemplate(), Record);<br class="">
> + Record.AddDeclRef(FTSInfo->getTemplate());<br class="">
> Record.push_back(FTSInfo->getTemplateSpecializationKind());<br class="">
><br class="">
> // Template arguments.<br class="">
> - Writer.AddTemplateArgumentList(FTSInfo->TemplateArguments, Record);<br class="">
> + Record.AddTemplateArgumentList(FTSInfo->TemplateArguments);<br class="">
><br class="">
> // Template args as written.<br class="">
> Record.push_back(FTSInfo->TemplateArgumentsAsWritten != nullptr);<br class="">
> @@ -569,20 +581,18 @@ void ASTDeclWriter::VisitFunctionDecl(Fu<br class="">
> Record.push_back(FTSInfo->TemplateArgumentsAsWritten->NumTemplateArgs);<br class="">
> for (int i=0, e = FTSInfo->TemplateArgumentsAsWritten->NumTemplateArgs;<br class="">
> i!=e; ++i)<br class="">
> - Writer.AddTemplateArgumentLoc((*FTSInfo->TemplateArgumentsAsWritten)[i],<br class="">
> - Record);<br class="">
> - Writer.AddSourceLocation(FTSInfo->TemplateArgumentsAsWritten->LAngleLoc,<br class="">
> - Record);<br class="">
> - Writer.AddSourceLocation(FTSInfo->TemplateArgumentsAsWritten->RAngleLoc,<br class="">
> - Record);<br class="">
> + Record.AddTemplateArgumentLoc(<br class="">
> + (*FTSInfo->TemplateArgumentsAsWritten)[i]);<br class="">
> + Record.AddSourceLocation(FTSInfo->TemplateArgumentsAsWritten->LAngleLoc);<br class="">
> + Record.AddSourceLocation(FTSInfo->TemplateArgumentsAsWritten->RAngleLoc);<br class="">
> }<br class="">
><br class="">
> - Writer.AddSourceLocation(FTSInfo->getPointOfInstantiation(), Record);<br class="">
> + Record.AddSourceLocation(FTSInfo->getPointOfInstantiation());<br class="">
><br class="">
> if (D->isCanonicalDecl()) {<br class="">
> // Write the template that contains the specializations set. We will<br class="">
> // add a FunctionTemplateSpecializationInfo to it when reading.<br class="">
> - Writer.AddDeclRef(FTSInfo->getTemplate()->getCanonicalDecl(), Record);<br class="">
> + Record.AddDeclRef(FTSInfo->getTemplate()->getCanonicalDecl());<br class="">
> }<br class="">
> break;<br class="">
> }<br class="">
> @@ -593,21 +603,21 @@ void ASTDeclWriter::VisitFunctionDecl(Fu<br class="">
> // Templates.<br class="">
> Record.push_back(DFTSInfo->getNumTemplates());<br class="">
> for (int i=0, e = DFTSInfo->getNumTemplates(); i != e; ++i)<br class="">
> - Writer.AddDeclRef(DFTSInfo->getTemplate(i), Record);<br class="">
> + Record.AddDeclRef(DFTSInfo->getTemplate(i));<br class="">
><br class="">
> // Templates args.<br class="">
> Record.push_back(DFTSInfo->getNumTemplateArgs());<br class="">
> for (int i=0, e = DFTSInfo->getNumTemplateArgs(); i != e; ++i)<br class="">
> - Writer.AddTemplateArgumentLoc(DFTSInfo->getTemplateArg(i), Record);<br class="">
> - Writer.AddSourceLocation(DFTSInfo->getLAngleLoc(), Record);<br class="">
> - Writer.AddSourceLocation(DFTSInfo->getRAngleLoc(), Record);<br class="">
> + Record.AddTemplateArgumentLoc(DFTSInfo->getTemplateArg(i));<br class="">
> + Record.AddSourceLocation(DFTSInfo->getLAngleLoc());<br class="">
> + Record.AddSourceLocation(DFTSInfo->getRAngleLoc());<br class="">
> break;<br class="">
> }<br class="">
> }<br class="">
><br class="">
> Record.push_back(D->param_size());<br class="">
> for (auto P : D->params())<br class="">
> - Writer.AddDeclRef(P, Record);<br class="">
> + Record.AddDeclRef(P);<br class="">
> Code = serialization::DECL_FUNCTION;<br class="">
> }<br class="">
><br class="">
> @@ -620,8 +630,8 @@ void ASTDeclWriter::VisitObjCMethodDecl(<br class="">
> Record.push_back(HasBodyStuff);<br class="">
> if (HasBodyStuff) {<br class="">
> Writer.AddStmt(D->getBody());<br class="">
> - Writer.AddDeclRef(D->getSelfDecl(), Record);<br class="">
> - Writer.AddDeclRef(D->getCmdDecl(), Record);<br class="">
> + Record.AddDeclRef(D->getSelfDecl());<br class="">
> + Record.AddDeclRef(D->getCmdDecl());<br class="">
> }<br class="">
> Record.push_back(D->isInstanceMethod());<br class="">
> Record.push_back(D->isVariadic());<br class="">
> @@ -634,7 +644,7 @@ void ASTDeclWriter::VisitObjCMethodDecl(<br class="">
> Record.push_back(D->HasRedeclaration);<br class="">
> if (D->HasRedeclaration) {<br class="">
> assert(Context.getObjCMethodRedeclaration(D));<br class="">
> - Writer.AddDeclRef(Context.getObjCMethodRedeclaration(D), Record);<br class="">
> + Record.AddDeclRef(Context.getObjCMethodRedeclaration(D));<br class="">
> }<br class="">
><br class="">
> // FIXME: stable encoding for @required/@optional<br class="">
> @@ -642,19 +652,19 @@ void ASTDeclWriter::VisitObjCMethodDecl(<br class="">
> // FIXME: stable encoding for in/out/inout/bycopy/byref/oneway/nullability<br class="">
> Record.push_back(D->getObjCDeclQualifier());<br class="">
> Record.push_back(D->hasRelatedResultType());<br class="">
> - Writer.AddTypeRef(D->getReturnType(), Record);<br class="">
> - Writer.AddTypeSourceInfo(D->getReturnTypeSourceInfo(), Record);<br class="">
> - Writer.AddSourceLocation(D->getLocEnd(), Record);<br class="">
> + Record.AddTypeRef(D->getReturnType());<br class="">
> + Record.AddTypeSourceInfo(D->getReturnTypeSourceInfo());<br class="">
> + Record.AddSourceLocation(D->getLocEnd());<br class="">
> Record.push_back(D->param_size());<br class="">
> for (const auto *P : D->params())<br class="">
> - Writer.AddDeclRef(P, Record);<br class="">
> + Record.AddDeclRef(P);<br class="">
><br class="">
> Record.push_back(D->SelLocsKind);<br class="">
> unsigned NumStoredSelLocs = D->getNumStoredSelLocs();<br class="">
> SourceLocation *SelLocs = D->getStoredSelLocs();<br class="">
> Record.push_back(NumStoredSelLocs);<br class="">
> for (unsigned i = 0; i != NumStoredSelLocs; ++i)<br class="">
> - Writer.AddSourceLocation(SelLocs[i], Record);<br class="">
> + Record.AddSourceLocation(SelLocs[i]);<br class="">
><br class="">
> Code = serialization::DECL_OBJC_METHOD;<br class="">
> }<br class="">
> @@ -663,23 +673,23 @@ void ASTDeclWriter::VisitObjCTypeParamDe<br class="">
> VisitTypedefNameDecl(D);<br class="">
> Record.push_back(D->Variance);<br class="">
> Record.push_back(D->Index);<br class="">
> - Writer.AddSourceLocation(D->VarianceLoc, Record);<br class="">
> - Writer.AddSourceLocation(D->ColonLoc, Record);<br class="">
> + Record.AddSourceLocation(D->VarianceLoc);<br class="">
> + Record.AddSourceLocation(D->ColonLoc);<br class="">
><br class="">
> Code = serialization::DECL_OBJC_TYPE_PARAM;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitObjCContainerDecl(ObjCContainerDecl *D) {<br class="">
> VisitNamedDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getAtStartLoc(), Record);<br class="">
> - Writer.AddSourceRange(D->getAtEndRange(), Record);<br class="">
> + Record.AddSourceLocation(D->getAtStartLoc());<br class="">
> + Record.AddSourceRange(D->getAtEndRange());<br class="">
> // Abstract class (no need to define a stable serialization::DECL code).<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitObjCInterfaceDecl(ObjCInterfaceDecl *D) {<br class="">
> VisitRedeclarable(D);<br class="">
> VisitObjCContainerDecl(D);<br class="">
> - Writer.AddTypeRef(QualType(D->getTypeForDecl(), 0), Record);<br class="">
> + Record.AddTypeRef(QualType(D->getTypeForDecl(), 0));<br class="">
> AddObjCTypeParamList(D->TypeParamList);<br class="">
><br class="">
> Record.push_back(D->isThisDeclarationADefinition());<br class="">
> @@ -687,16 +697,16 @@ void ASTDeclWriter::VisitObjCInterfaceDe<br class="">
> // Write the DefinitionData<br class="">
> ObjCInterfaceDecl::DefinitionData &Data = D->data();<br class="">
><br class="">
> - Writer.AddTypeSourceInfo(D->getSuperClassTInfo(), Record);<br class="">
> - Writer.AddSourceLocation(D->getEndOfDefinitionLoc(), Record);<br class="">
> + Record.AddTypeSourceInfo(D->getSuperClassTInfo());<br class="">
> + Record.AddSourceLocation(D->getEndOfDefinitionLoc());<br class="">
> Record.push_back(Data.HasDesignatedInitializers);<br class="">
><br class="">
> // Write out the protocols that are directly referenced by the @interface.<br class="">
> Record.push_back(Data.ReferencedProtocols.size());<br class="">
> for (const auto *P : D->protocols())<br class="">
> - Writer.AddDeclRef(P, Record);<br class="">
> + Record.AddDeclRef(P);<br class="">
> for (const auto &PL : D->protocol_locs())<br class="">
> - Writer.AddSourceLocation(PL, Record);<br class="">
> + Record.AddSourceLocation(PL);<br class="">
><br class="">
> // Write out the protocols that are transitively referenced.<br class="">
> Record.push_back(Data.AllReferencedProtocols.size());<br class="">
> @@ -704,7 +714,7 @@ void ASTDeclWriter::VisitObjCInterfaceDe<br class="">
> P = Data.AllReferencedProtocols.begin(),<br class="">
> PEnd = Data.AllReferencedProtocols.end();<br class="">
> P != PEnd; ++P)<br class="">
> - Writer.AddDeclRef(*P, Record);<br class="">
> + Record.AddDeclRef(*P);<br class="">
><br class="">
><br class="">
> if (ObjCCategoryDecl *Cat = D->getCategoryListRaw()) {<br class="">
> @@ -749,9 +759,9 @@ void ASTDeclWriter::VisitObjCProtocolDec<br class="">
> if (D->isThisDeclarationADefinition()) {<br class="">
> Record.push_back(D->protocol_size());<br class="">
> for (const auto *I : D->protocols())<br class="">
> - Writer.AddDeclRef(I, Record);<br class="">
> + Record.AddDeclRef(I);<br class="">
> for (const auto &PL : D->protocol_locs())<br class="">
> - Writer.AddSourceLocation(PL, Record);<br class="">
> + Record.AddSourceLocation(PL);<br class="">
> }<br class="">
><br class="">
> Code = serialization::DECL_OBJC_PROTOCOL;<br class="">
> @@ -764,78 +774,78 @@ void ASTDeclWriter::VisitObjCAtDefsField<br class="">
><br class="">
> void ASTDeclWriter::VisitObjCCategoryDecl(ObjCCategoryDecl *D) {<br class="">
> VisitObjCContainerDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getCategoryNameLoc(), Record);<br class="">
> - Writer.AddSourceLocation(D->getIvarLBraceLoc(), Record);<br class="">
> - Writer.AddSourceLocation(D->getIvarRBraceLoc(), Record);<br class="">
> - Writer.AddDeclRef(D->getClassInterface(), Record);<br class="">
> + Record.AddSourceLocation(D->getCategoryNameLoc());<br class="">
> + Record.AddSourceLocation(D->getIvarLBraceLoc());<br class="">
> + Record.AddSourceLocation(D->getIvarRBraceLoc());<br class="">
> + Record.AddDeclRef(D->getClassInterface());<br class="">
> AddObjCTypeParamList(D->TypeParamList);<br class="">
> Record.push_back(D->protocol_size());<br class="">
> for (const auto *I : D->protocols())<br class="">
> - Writer.AddDeclRef(I, Record);<br class="">
> + Record.AddDeclRef(I);<br class="">
> for (const auto &PL : D->protocol_locs())<br class="">
> - Writer.AddSourceLocation(PL, Record);<br class="">
> + Record.AddSourceLocation(PL);<br class="">
> Code = serialization::DECL_OBJC_CATEGORY;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitObjCCompatibleAliasDecl(ObjCCompatibleAliasDecl *D) {<br class="">
> VisitNamedDecl(D);<br class="">
> - Writer.AddDeclRef(D->getClassInterface(), Record);<br class="">
> + Record.AddDeclRef(D->getClassInterface());<br class="">
> Code = serialization::DECL_OBJC_COMPATIBLE_ALIAS;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitObjCPropertyDecl(ObjCPropertyDecl *D) {<br class="">
> VisitNamedDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getAtLoc(), Record);<br class="">
> - Writer.AddSourceLocation(D->getLParenLoc(), Record);<br class="">
> - Writer.AddTypeRef(D->getType(), Record);<br class="">
> - Writer.AddTypeSourceInfo(D->getTypeSourceInfo(), Record);<br class="">
> + Record.AddSourceLocation(D->getAtLoc());<br class="">
> + Record.AddSourceLocation(D->getLParenLoc());<br class="">
> + Record.AddTypeRef(D->getType());<br class="">
> + Record.AddTypeSourceInfo(D->getTypeSourceInfo());<br class="">
> // FIXME: stable encoding<br class="">
> Record.push_back((unsigned)D->getPropertyAttributes());<br class="">
> Record.push_back((unsigned)D->getPropertyAttributesAsWritten());<br class="">
> // FIXME: stable encoding<br class="">
> Record.push_back((unsigned)D->getPropertyImplementation());<br class="">
> - Writer.AddDeclarationName(D->getGetterName(), Record);<br class="">
> - Writer.AddDeclarationName(D->getSetterName(), Record);<br class="">
> - Writer.AddDeclRef(D->getGetterMethodDecl(), Record);<br class="">
> - Writer.AddDeclRef(D->getSetterMethodDecl(), Record);<br class="">
> - Writer.AddDeclRef(D->getPropertyIvarDecl(), Record);<br class="">
> + Record.AddDeclarationName(D->getGetterName());<br class="">
> + Record.AddDeclarationName(D->getSetterName());<br class="">
> + Record.AddDeclRef(D->getGetterMethodDecl());<br class="">
> + Record.AddDeclRef(D->getSetterMethodDecl());<br class="">
> + Record.AddDeclRef(D->getPropertyIvarDecl());<br class="">
> Code = serialization::DECL_OBJC_PROPERTY;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitObjCImplDecl(ObjCImplDecl *D) {<br class="">
> VisitObjCContainerDecl(D);<br class="">
> - Writer.AddDeclRef(D->getClassInterface(), Record);<br class="">
> + Record.AddDeclRef(D->getClassInterface());<br class="">
> // Abstract class (no need to define a stable serialization::DECL code).<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitObjCCategoryImplDecl(ObjCCategoryImplDecl *D) {<br class="">
> VisitObjCImplDecl(D);<br class="">
> - Writer.AddIdentifierRef(D->getIdentifier(), Record);<br class="">
> - Writer.AddSourceLocation(D->getCategoryNameLoc(), Record);<br class="">
> + Record.AddIdentifierRef(D->getIdentifier());<br class="">
> + Record.AddSourceLocation(D->getCategoryNameLoc());<br class="">
> Code = serialization::DECL_OBJC_CATEGORY_IMPL;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitObjCImplementationDecl(ObjCImplementationDecl *D) {<br class="">
> VisitObjCImplDecl(D);<br class="">
> - Writer.AddDeclRef(D->getSuperClass(), Record);<br class="">
> - Writer.AddSourceLocation(D->getSuperClassLoc(), Record);<br class="">
> - Writer.AddSourceLocation(D->getIvarLBraceLoc(), Record);<br class="">
> - Writer.AddSourceLocation(D->getIvarRBraceLoc(), Record);<br class="">
> + Record.AddDeclRef(D->getSuperClass());<br class="">
> + Record.AddSourceLocation(D->getSuperClassLoc());<br class="">
> + Record.AddSourceLocation(D->getIvarLBraceLoc());<br class="">
> + Record.AddSourceLocation(D->getIvarRBraceLoc());<br class="">
> Record.push_back(D->hasNonZeroConstructors());<br class="">
> Record.push_back(D->hasDestructors());<br class="">
> Record.push_back(D->NumIvarInitializers);<br class="">
> if (D->NumIvarInitializers)<br class="">
> - Writer.AddCXXCtorInitializersRef(<br class="">
> - llvm::makeArrayRef(D->init_begin(), D->init_end()), Record);<br class="">
> + Record.AddCXXCtorInitializersRef(<br class="">
> + llvm::makeArrayRef(D->init_begin(), D->init_end()));<br class="">
> Code = serialization::DECL_OBJC_IMPLEMENTATION;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitObjCPropertyImplDecl(ObjCPropertyImplDecl *D) {<br class="">
> VisitDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getLocStart(), Record);<br class="">
> - Writer.AddDeclRef(D->getPropertyDecl(), Record);<br class="">
> - Writer.AddDeclRef(D->getPropertyIvarDecl(), Record);<br class="">
> - Writer.AddSourceLocation(D->getPropertyIvarDeclLoc(), Record);<br class="">
> + Record.AddSourceLocation(D->getLocStart());<br class="">
> + Record.AddDeclRef(D->getPropertyDecl());<br class="">
> + Record.AddDeclRef(D->getPropertyIvarDecl());<br class="">
> + Record.AddSourceLocation(D->getPropertyIvarDeclLoc());<br class="">
> Writer.AddStmt(D->getGetterCXXConstructor());<br class="">
> Writer.AddStmt(D->getSetterCXXAssignment());<br class="">
> Code = serialization::DECL_OBJC_PROPERTY_IMPL;<br class="">
> @@ -849,15 +859,14 @@ void ASTDeclWriter::VisitFieldDecl(Field<br class="">
> Record.push_back(0);<br class="">
> } else if (D->InitStorage.getInt() == FieldDecl::ISK_CapturedVLAType) {<br class="">
> Record.push_back(D->InitStorage.getInt() + 1);<br class="">
> - Writer.AddTypeRef(<br class="">
> - QualType(static_cast<Type *>(D->InitStorage.getPointer()), 0),<br class="">
> - Record);<br class="">
> + Record.AddTypeRef(<br class="">
> + QualType(static_cast<Type *>(D->InitStorage.getPointer()), 0));<br class="">
> } else {<br class="">
> Record.push_back(D->InitStorage.getInt() + 1);<br class="">
> Writer.AddStmt(static_cast<Expr *>(D->InitStorage.getPointer()));<br class="">
> }<br class="">
> if (!D->getDeclName())<br class="">
> - Writer.AddDeclRef(Context.getInstantiatedFromUnnamedFieldDecl(D), Record);<br class="">
> + Record.AddDeclRef(Context.getInstantiatedFromUnnamedFieldDecl(D));<br class="">
><br class="">
> if (D->getDeclContext() == D->getLexicalDeclContext() &&<br class="">
> !D->hasAttrs() &&<br class="">
> @@ -880,8 +889,8 @@ void ASTDeclWriter::VisitFieldDecl(Field<br class="">
><br class="">
> void ASTDeclWriter::VisitMSPropertyDecl(MSPropertyDecl *D) {<br class="">
> VisitDeclaratorDecl(D);<br class="">
> - Writer.AddIdentifierRef(D->getGetterId(), Record);<br class="">
> - Writer.AddIdentifierRef(D->getSetterId(), Record);<br class="">
> + Record.AddIdentifierRef(D->getGetterId());<br class="">
> + Record.AddIdentifierRef(D->getSetterId());<br class="">
> Code = serialization::DECL_MS_PROPERTY;<br class="">
> }<br class="">
><br class="">
> @@ -890,7 +899,7 @@ void ASTDeclWriter::VisitIndirectFieldDe<br class="">
> Record.push_back(D->getChainingSize());<br class="">
><br class="">
> for (const auto *P : D->chain())<br class="">
> - Writer.AddDeclRef(P, Record);<br class="">
> + Record.AddDeclRef(P);<br class="">
> Code = serialization::DECL_INDIRECTFIELD;<br class="">
> }<br class="">
><br class="">
> @@ -923,13 +932,13 @@ void ASTDeclWriter::VisitVarDecl(VarDecl<br class="">
> };<br class="">
> if (VarTemplateDecl *TemplD = D->getDescribedVarTemplate()) {<br class="">
> Record.push_back(VarTemplate);<br class="">
> - Writer.AddDeclRef(TemplD, Record);<br class="">
> + Record.AddDeclRef(TemplD);<br class="">
> } else if (MemberSpecializationInfo *SpecInfo<br class="">
> = D->getMemberSpecializationInfo()) {<br class="">
> Record.push_back(StaticDataMemberSpecialization);<br class="">
> - Writer.AddDeclRef(SpecInfo->getInstantiatedFrom(), Record);<br class="">
> + Record.AddDeclRef(SpecInfo->getInstantiatedFrom());<br class="">
> Record.push_back(SpecInfo->getTemplateSpecializationKind());<br class="">
> - Writer.AddSourceLocation(SpecInfo->getPointOfInstantiation(), Record);<br class="">
> + Record.AddSourceLocation(SpecInfo->getPointOfInstantiation());<br class="">
> } else {<br class="">
> Record.push_back(VarNotTemplate);<br class="">
> }<br class="">
> @@ -1015,7 +1024,7 @@ void ASTDeclWriter::VisitParmVarDecl(Par<br class="">
> void ASTDeclWriter::VisitFileScopeAsmDecl(FileScopeAsmDecl *D) {<br class="">
> VisitDecl(D);<br class="">
> Writer.AddStmt(D->getAsmString());<br class="">
> - Writer.AddSourceLocation(D->getRParenLoc(), Record);<br class="">
> + Record.AddSourceLocation(D->getRParenLoc());<br class="">
> Code = serialization::DECL_FILE_SCOPE_ASM;<br class="">
> }<br class="">
><br class="">
> @@ -1027,18 +1036,18 @@ void ASTDeclWriter::VisitEmptyDecl(Empty<br class="">
> void ASTDeclWriter::VisitBlockDecl(BlockDecl *D) {<br class="">
> VisitDecl(D);<br class="">
> Writer.AddStmt(D->getBody());<br class="">
> - Writer.AddTypeSourceInfo(D->getSignatureAsWritten(), Record);<br class="">
> + Record.AddTypeSourceInfo(D->getSignatureAsWritten());<br class="">
> Record.push_back(D->param_size());<br class="">
> for (FunctionDecl::param_iterator P = D->param_begin(), PEnd = D->param_end();<br class="">
> P != PEnd; ++P)<br class="">
> - Writer.AddDeclRef(*P, Record);<br class="">
> + Record.AddDeclRef(*P);<br class="">
> Record.push_back(D->isVariadic());<br class="">
> Record.push_back(D->blockMissingReturnType());<br class="">
> Record.push_back(D->isConversionFromLambda());<br class="">
> Record.push_back(D->capturesCXXThis());<br class="">
> Record.push_back(D->getNumCaptures());<br class="">
> for (const auto &capture : D->captures()) {<br class="">
> - Writer.AddDeclRef(capture.getVariable(), Record);<br class="">
> + Record.AddDeclRef(capture.getVariable());<br class="">
><br class="">
> unsigned flags = 0;<br class="">
> if (capture.isByRef()) flags |= 1;<br class="">
> @@ -1059,21 +1068,21 @@ void ASTDeclWriter::VisitCapturedDecl(Ca<br class="">
> Record.push_back(CD->isNothrow() ? 1 : 0);<br class="">
> // Body is stored by VisitCapturedStmt.<br class="">
> for (unsigned I = 0; I < CD->getNumParams(); ++I)<br class="">
> - Writer.AddDeclRef(CD->getParam(I), Record);<br class="">
> + Record.AddDeclRef(CD->getParam(I));<br class="">
> Code = serialization::DECL_CAPTURED;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitLinkageSpecDecl(LinkageSpecDecl *D) {<br class="">
> VisitDecl(D);<br class="">
> Record.push_back(D->getLanguage());<br class="">
> - Writer.AddSourceLocation(D->getExternLoc(), Record);<br class="">
> - Writer.AddSourceLocation(D->getRBraceLoc(), Record);<br class="">
> + Record.AddSourceLocation(D->getExternLoc());<br class="">
> + Record.AddSourceLocation(D->getRBraceLoc());<br class="">
> Code = serialization::DECL_LINKAGE_SPEC;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitLabelDecl(LabelDecl *D) {<br class="">
> VisitNamedDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getLocStart(), Record);<br class="">
> + Record.AddSourceLocation(D->getLocStart());<br class="">
> Code = serialization::DECL_LABEL;<br class="">
> }<br class="">
><br class="">
> @@ -1082,11 +1091,11 @@ void ASTDeclWriter::VisitNamespaceDecl(N<br class="">
> VisitRedeclarable(D);<br class="">
> VisitNamedDecl(D);<br class="">
> Record.push_back(D->isInline());<br class="">
> - Writer.AddSourceLocation(D->getLocStart(), Record);<br class="">
> - Writer.AddSourceLocation(D->getRBraceLoc(), Record);<br class="">
> + Record.AddSourceLocation(D->getLocStart());<br class="">
> + Record.AddSourceLocation(D->getRBraceLoc());<br class="">
><br class="">
> if (D->isOriginalNamespace())<br class="">
> - Writer.AddDeclRef(D->getAnonymousNamespace(), Record);<br class="">
> + Record.AddDeclRef(D->getAnonymousNamespace());<br class="">
> Code = serialization::DECL_NAMESPACE;<br class="">
><br class="">
> if (Writer.hasChain() && D->isAnonymousNamespace() &&<br class="">
> @@ -1107,56 +1116,56 @@ void ASTDeclWriter::VisitNamespaceDecl(N<br class="">
> void ASTDeclWriter::VisitNamespaceAliasDecl(NamespaceAliasDecl *D) {<br class="">
> VisitRedeclarable(D);<br class="">
> VisitNamedDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getNamespaceLoc(), Record);<br class="">
> - Writer.AddSourceLocation(D->getTargetNameLoc(), Record);<br class="">
> - Writer.AddNestedNameSpecifierLoc(D->getQualifierLoc(), Record);<br class="">
> - Writer.AddDeclRef(D->getNamespace(), Record);<br class="">
> + Record.AddSourceLocation(D->getNamespaceLoc());<br class="">
> + Record.AddSourceLocation(D->getTargetNameLoc());<br class="">
> + Record.AddNestedNameSpecifierLoc(D->getQualifierLoc());<br class="">
> + Record.AddDeclRef(D->getNamespace());<br class="">
> Code = serialization::DECL_NAMESPACE_ALIAS;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitUsingDecl(UsingDecl *D) {<br class="">
> VisitNamedDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getUsingLoc(), Record);<br class="">
> - Writer.AddNestedNameSpecifierLoc(D->getQualifierLoc(), Record);<br class="">
> - Writer.AddDeclarationNameLoc(D->DNLoc, D->getDeclName(), Record);<br class="">
> - Writer.AddDeclRef(D->FirstUsingShadow.getPointer(), Record);<br class="">
> + Record.AddSourceLocation(D->getUsingLoc());<br class="">
> + Record.AddNestedNameSpecifierLoc(D->getQualifierLoc());<br class="">
> + Record.AddDeclarationNameLoc(D->DNLoc, D->getDeclName());<br class="">
> + Record.AddDeclRef(D->FirstUsingShadow.getPointer());<br class="">
> Record.push_back(D->hasTypename());<br class="">
> - Writer.AddDeclRef(Context.getInstantiatedFromUsingDecl(D), Record);<br class="">
> + Record.AddDeclRef(Context.getInstantiatedFromUsingDecl(D));<br class="">
> Code = serialization::DECL_USING;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitUsingShadowDecl(UsingShadowDecl *D) {<br class="">
> VisitRedeclarable(D);<br class="">
> VisitNamedDecl(D);<br class="">
> - Writer.AddDeclRef(D->getTargetDecl(), Record);<br class="">
> - Writer.AddDeclRef(D->UsingOrNextShadow, Record);<br class="">
> - Writer.AddDeclRef(Context.getInstantiatedFromUsingShadowDecl(D), Record);<br class="">
> + Record.AddDeclRef(D->getTargetDecl());<br class="">
> + Record.AddDeclRef(D->UsingOrNextShadow);<br class="">
> + Record.AddDeclRef(Context.getInstantiatedFromUsingShadowDecl(D));<br class="">
> Code = serialization::DECL_USING_SHADOW;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitUsingDirectiveDecl(UsingDirectiveDecl *D) {<br class="">
> VisitNamedDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getUsingLoc(), Record);<br class="">
> - Writer.AddSourceLocation(D->getNamespaceKeyLocation(), Record);<br class="">
> - Writer.AddNestedNameSpecifierLoc(D->getQualifierLoc(), Record);<br class="">
> - Writer.AddDeclRef(D->getNominatedNamespace(), Record);<br class="">
> - Writer.AddDeclRef(dyn_cast<Decl>(D->getCommonAncestor()), Record);<br class="">
> + Record.AddSourceLocation(D->getUsingLoc());<br class="">
> + Record.AddSourceLocation(D->getNamespaceKeyLocation());<br class="">
> + Record.AddNestedNameSpecifierLoc(D->getQualifierLoc());<br class="">
> + Record.AddDeclRef(D->getNominatedNamespace());<br class="">
> + Record.AddDeclRef(dyn_cast<Decl>(D->getCommonAncestor()));<br class="">
> Code = serialization::DECL_USING_DIRECTIVE;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitUnresolvedUsingValueDecl(UnresolvedUsingValueDecl *D) {<br class="">
> VisitValueDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getUsingLoc(), Record);<br class="">
> - Writer.AddNestedNameSpecifierLoc(D->getQualifierLoc(), Record);<br class="">
> - Writer.AddDeclarationNameLoc(D->DNLoc, D->getDeclName(), Record);<br class="">
> + Record.AddSourceLocation(D->getUsingLoc());<br class="">
> + Record.AddNestedNameSpecifierLoc(D->getQualifierLoc());<br class="">
> + Record.AddDeclarationNameLoc(D->DNLoc, D->getDeclName());<br class="">
> Code = serialization::DECL_UNRESOLVED_USING_VALUE;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitUnresolvedUsingTypenameDecl(<br class="">
> UnresolvedUsingTypenameDecl *D) {<br class="">
> VisitTypeDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getTypenameLoc(), Record);<br class="">
> - Writer.AddNestedNameSpecifierLoc(D->getQualifierLoc(), Record);<br class="">
> + Record.AddSourceLocation(D->getTypenameLoc());<br class="">
> + Record.AddNestedNameSpecifierLoc(D->getQualifierLoc());<br class="">
> Code = serialization::DECL_UNRESOLVED_USING_TYPENAME;<br class="">
> }<br class="">
><br class="">
> @@ -1168,25 +1177,25 @@ void ASTDeclWriter::VisitCXXRecordDecl(C<br class="">
> };<br class="">
> if (ClassTemplateDecl *TemplD = D->getDescribedClassTemplate()) {<br class="">
> Record.push_back(CXXRecTemplate);<br class="">
> - Writer.AddDeclRef(TemplD, Record);<br class="">
> + Record.AddDeclRef(TemplD);<br class="">
> } else if (MemberSpecializationInfo *MSInfo<br class="">
> = D->getMemberSpecializationInfo()) {<br class="">
> Record.push_back(CXXRecMemberSpecialization);<br class="">
> - Writer.AddDeclRef(MSInfo->getInstantiatedFrom(), Record);<br class="">
> + Record.AddDeclRef(MSInfo->getInstantiatedFrom());<br class="">
> Record.push_back(MSInfo->getTemplateSpecializationKind());<br class="">
> - Writer.AddSourceLocation(MSInfo->getPointOfInstantiation(), Record);<br class="">
> + Record.AddSourceLocation(MSInfo->getPointOfInstantiation());<br class="">
> } else {<br class="">
> Record.push_back(CXXRecNotTemplate);<br class="">
> }<br class="">
><br class="">
> Record.push_back(D->isThisDeclarationADefinition());<br class="">
> if (D->isThisDeclarationADefinition())<br class="">
> - Writer.AddCXXDefinitionData(D, Record);<br class="">
> + Record.AddCXXDefinitionData(D);<br class="">
><br class="">
> // Store (what we currently believe to be) the key function to avoid<br class="">
> // deserializing every method so we can compute it.<br class="">
> if (D->IsCompleteDefinition)<br class="">
> - Writer.AddDeclRef(Context.getCurrentKeyFunction(D), Record);<br class="">
> + Record.AddDeclRef(Context.getCurrentKeyFunction(D));<br class="">
><br class="">
> Code = serialization::DECL_CXX_RECORD;<br class="">
> }<br class="">
> @@ -1198,7 +1207,7 @@ void ASTDeclWriter::VisitCXXMethodDecl(C<br class="">
> for (CXXMethodDecl::method_iterator<br class="">
> I = D->begin_overridden_methods(), E = D->end_overridden_methods();<br class="">
> I != E; ++I)<br class="">
> - Writer.AddDeclRef(*I, Record);<br class="">
> + Record.AddDeclRef(*I);<br class="">
> } else {<br class="">
> // We only need to record overridden methods once for the canonical decl.<br class="">
> Record.push_back(0);<br class="">
> @@ -1221,7 +1230,7 @@ void ASTDeclWriter::VisitCXXMethodDecl(C<br class="">
> void ASTDeclWriter::VisitCXXConstructorDecl(CXXConstructorDecl *D) {<br class="">
> VisitCXXMethodDecl(D);<br class="">
><br class="">
> - Writer.AddDeclRef(D->getInheritedConstructor(), Record);<br class="">
> + Record.AddDeclRef(D->getInheritedConstructor());<br class="">
> Record.push_back(D->IsExplicitSpecified);<br class="">
><br class="">
> Code = serialization::DECL_CXX_CONSTRUCTOR;<br class="">
> @@ -1230,7 +1239,7 @@ void ASTDeclWriter::VisitCXXConstructorD<br class="">
> void ASTDeclWriter::VisitCXXDestructorDecl(CXXDestructorDecl *D) {<br class="">
> VisitCXXMethodDecl(D);<br class="">
><br class="">
> - Writer.AddDeclRef(D->getOperatorDelete(), Record);<br class="">
> + Record.AddDeclRef(D->getOperatorDelete());<br class="">
><br class="">
> Code = serialization::DECL_CXX_DESTRUCTOR;<br class="">
> }<br class="">
> @@ -1247,11 +1256,11 @@ void ASTDeclWriter::VisitImportDecl(Impo<br class="">
> ArrayRef<SourceLocation> IdentifierLocs = D->getIdentifierLocs();<br class="">
> Record.push_back(!IdentifierLocs.empty());<br class="">
> if (IdentifierLocs.empty()) {<br class="">
> - Writer.AddSourceLocation(D->getLocEnd(), Record);<br class="">
> + Record.AddSourceLocation(D->getLocEnd());<br class="">
> Record.push_back(1);<br class="">
> } else {<br class="">
> for (unsigned I = 0, N = IdentifierLocs.size(); I != N; ++I)<br class="">
> - Writer.AddSourceLocation(IdentifierLocs[I], Record);<br class="">
> + Record.AddSourceLocation(IdentifierLocs[I]);<br class="">
> Record.push_back(IdentifierLocs.size());<br class="">
> }<br class="">
> // Note: the number of source locations must always be the last element in<br class="">
> @@ -1261,7 +1270,7 @@ void ASTDeclWriter::VisitImportDecl(Impo<br class="">
><br class="">
> void ASTDeclWriter::VisitAccessSpecDecl(AccessSpecDecl *D) {<br class="">
> VisitDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getColonLoc(), Record);<br class="">
> + Record.AddSourceLocation(D->getColonLoc());<br class="">
> Code = serialization::DECL_ACCESS_SPEC;<br class="">
> }<br class="">
><br class="">
> @@ -1273,15 +1282,14 @@ void ASTDeclWriter::VisitFriendDecl(Frie<br class="">
> bool hasFriendDecl = D-><a href="http://friend.is" class="">Friend.is</a><NamedDecl*>();<br class="">
> Record.push_back(hasFriendDecl);<br class="">
> if (hasFriendDecl)<br class="">
> - Writer.AddDeclRef(D->getFriendDecl(), Record);<br class="">
> + Record.AddDeclRef(D->getFriendDecl());<br class="">
> else<br class="">
> - Writer.AddTypeSourceInfo(D->getFriendType(), Record);<br class="">
> + Record.AddTypeSourceInfo(D->getFriendType());<br class="">
> for (unsigned i = 0; i < D->NumTPLists; ++i)<br class="">
> - Writer.AddTemplateParameterList(D->getFriendTypeTemplateParameterList(i),<br class="">
> - Record);<br class="">
> - Writer.AddDeclRef(D->getNextFriend(), Record);<br class="">
> + Record.AddTemplateParameterList(D->getFriendTypeTemplateParameterList(i));<br class="">
> + Record.AddDeclRef(D->getNextFriend());<br class="">
> Record.push_back(D->UnsupportedFriend);<br class="">
> - Writer.AddSourceLocation(D->FriendLoc, Record);<br class="">
> + Record.AddSourceLocation(D->FriendLoc);<br class="">
> Code = serialization::DECL_FRIEND;<br class="">
> }<br class="">
><br class="">
> @@ -1289,21 +1297,21 @@ void ASTDeclWriter::VisitFriendTemplateD<br class="">
> VisitDecl(D);<br class="">
> Record.push_back(D->getNumTemplateParameters());<br class="">
> for (unsigned i = 0, e = D->getNumTemplateParameters(); i != e; ++i)<br class="">
> - Writer.AddTemplateParameterList(D->getTemplateParameterList(i), Record);<br class="">
> + Record.AddTemplateParameterList(D->getTemplateParameterList(i));<br class="">
> Record.push_back(D->getFriendDecl() != nullptr);<br class="">
> if (D->getFriendDecl())<br class="">
> - Writer.AddDeclRef(D->getFriendDecl(), Record);<br class="">
> + Record.AddDeclRef(D->getFriendDecl());<br class="">
> else<br class="">
> - Writer.AddTypeSourceInfo(D->getFriendType(), Record);<br class="">
> - Writer.AddSourceLocation(D->getFriendLoc(), Record);<br class="">
> + Record.AddTypeSourceInfo(D->getFriendType());<br class="">
> + Record.AddSourceLocation(D->getFriendLoc());<br class="">
> Code = serialization::DECL_FRIEND_TEMPLATE;<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitTemplateDecl(TemplateDecl *D) {<br class="">
> VisitNamedDecl(D);<br class="">
><br class="">
> - Writer.AddDeclRef(D->getTemplatedDecl(), Record);<br class="">
> - Writer.AddTemplateParameterList(D->getTemplateParameters(), Record);<br class="">
> + Record.AddDeclRef(D->getTemplatedDecl());<br class="">
> + Record.AddTemplateParameterList(D->getTemplateParameters());<br class="">
> }<br class="">
><br class="">
> void ASTDeclWriter::VisitRedeclarableTemplateDecl(RedeclarableTemplateDecl *D) {<br class="">
> @@ -1313,7 +1321,7 @@ void ASTDeclWriter::VisitRedeclarableTem<br class="">
> // getCommonPtr() can be used while this is still initializing.<br class="">
> if (D->isFirstDecl()) {<br class="">
> // This declaration owns the 'common' pointer, so serialize that data now.<br class="">
> - Writer.AddDeclRef(D->getInstantiatedFromMemberTemplate(), Record);<br class="">
> + Record.AddDeclRef(D->getInstantiatedFromMemberTemplate());<br class="">
> if (D->getInstantiatedFromMemberTemplate())<br class="">
> Record.push_back(D->isMemberSpecialization());<br class="">
> }<br class="">
> @@ -1340,28 +1348,27 @@ void ASTDeclWriter::VisitClassTemplateSp<br class="">
> ClassTemplatePartialSpecializationDecl *> InstFrom<br class="">
> = D->getSpecializedTemplateOrPartial();<br class="">
> if (Decl *InstFromD = InstFrom.dyn_cast<ClassTemplateDecl *>()) {<br class="">
> - Writer.AddDeclRef(InstFromD, Record);<br class="">
> + Record.AddDeclRef(InstFromD);<br class="">
> } else {<br class="">
> - Writer.AddDeclRef(InstFrom.get<ClassTemplatePartialSpecializationDecl *>(),<br class="">
> - Record);<br class="">
> - Writer.AddTemplateArgumentList(&D->getTemplateInstantiationArgs(), Record);<br class="">
> + Record.AddDeclRef(InstFrom.get<ClassTemplatePartialSpecializationDecl *>());<br class="">
> + Record.AddTemplateArgumentList(&D->getTemplateInstantiationArgs());<br class="">
> }<br class="">
><br class="">
> - Writer.AddTemplateArgumentList(&D->getTemplateArgs(), Record);<br class="">
> - Writer.AddSourceLocation(D->getPointOfInstantiation(), Record);<br class="">
> + Record.AddTemplateArgumentList(&D->getTemplateArgs());<br class="">
> + Record.AddSourceLocation(D->getPointOfInstantiation());<br class="">
> Record.push_back(D->getSpecializationKind());<br class="">
> Record.push_back(D->isCanonicalDecl());<br class="">
><br class="">
> if (D->isCanonicalDecl()) {<br class="">
> // When reading, we'll add it to the folding set of the following template.<br class="">
> - Writer.AddDeclRef(D->getSpecializedTemplate()->getCanonicalDecl(), Record);<br class="">
> + Record.AddDeclRef(D->getSpecializedTemplate()->getCanonicalDecl());<br class="">
> }<br class="">
><br class="">
> // Explicit info.<br class="">
> - Writer.AddTypeSourceInfo(D->getTypeAsWritten(), Record);<br class="">
> + Record.AddTypeSourceInfo(D->getTypeAsWritten());<br class="">
> if (D->getTypeAsWritten()) {<br class="">
> - Writer.AddSourceLocation(D->getExternLoc(), Record);<br class="">
> - Writer.AddSourceLocation(D->getTemplateKeywordLoc(), Record);<br class="">
> + Record.AddSourceLocation(D->getExternLoc());<br class="">
> + Record.AddSourceLocation(D->getTemplateKeywordLoc());<br class="">
> }<br class="">
><br class="">
> Code = serialization::DECL_CLASS_TEMPLATE_SPECIALIZATION;<br class="">
> @@ -1371,12 +1378,12 @@ void ASTDeclWriter::VisitClassTemplatePa<br class="">
> ClassTemplatePartialSpecializationDecl *D) {<br class="">
> VisitClassTemplateSpecializationDecl(D);<br class="">
><br class="">
> - Writer.AddTemplateParameterList(D->getTemplateParameters(), Record);<br class="">
> - Writer.AddASTTemplateArgumentListInfo(D->getTemplateArgsAsWritten(), Record);<br class="">
> + Record.AddTemplateParameterList(D->getTemplateParameters());<br class="">
> + Record.AddASTTemplateArgumentListInfo(D->getTemplateArgsAsWritten());<br class="">
><br class="">
> // These are read/set from/to the first declaration.<br class="">
> if (D->getPreviousDecl() == nullptr) {<br class="">
> - Writer.AddDeclRef(D->getInstantiatedFromMember(), Record);<br class="">
> + Record.AddDeclRef(D->getInstantiatedFromMember());<br class="">
> Record.push_back(D->isMemberSpecialization());<br class="">
> }<br class="">
><br class="">
> @@ -1400,28 +1407,27 @@ void ASTDeclWriter::VisitVarTemplateSpec<br class="">
> llvm::PointerUnion<VarTemplateDecl *, VarTemplatePartialSpecializationDecl *><br class="">
> InstFrom = D->getSpecializedTemplateOrPartial();<br class="">
> if (Decl *InstFromD = InstFrom.dyn_cast<VarTemplateDecl *>()) {<br class="">
> - Writer.AddDeclRef(InstFromD, Record);<br class="">
> + Record.AddDeclRef(InstFromD);<br class="">
> } else {<br class="">
> - Writer.AddDeclRef(InstFrom.get<VarTemplatePartialSpecializationDecl *>(),<br class="">
> - Record);<br class="">
> - Writer.AddTemplateArgumentList(&D->getTemplateInstantiationArgs(), Record);<br class="">
> + Record.AddDeclRef(InstFrom.get<VarTemplatePartialSpecializationDecl *>());<br class="">
> + Record.AddTemplateArgumentList(&D->getTemplateInstantiationArgs());<br class="">
> }<br class="">
><br class="">
> // Explicit info.<br class="">
> - Writer.AddTypeSourceInfo(D->getTypeAsWritten(), Record);<br class="">
> + Record.AddTypeSourceInfo(D->getTypeAsWritten());<br class="">
> if (D->getTypeAsWritten()) {<br class="">
> - Writer.AddSourceLocation(D->getExternLoc(), Record);<br class="">
> - Writer.AddSourceLocation(D->getTemplateKeywordLoc(), Record);<br class="">
> + Record.AddSourceLocation(D->getExternLoc());<br class="">
> + Record.AddSourceLocation(D->getTemplateKeywordLoc());<br class="">
> }<br class="">
><br class="">
> - Writer.AddTemplateArgumentList(&D->getTemplateArgs(), Record);<br class="">
> - Writer.AddSourceLocation(D->getPointOfInstantiation(), Record);<br class="">
> + Record.AddTemplateArgumentList(&D->getTemplateArgs());<br class="">
> + Record.AddSourceLocation(D->getPointOfInstantiation());<br class="">
> Record.push_back(D->getSpecializationKind());<br class="">
> Record.push_back(D->isCanonicalDecl());<br class="">
><br class="">
> if (D->isCanonicalDecl()) {<br class="">
> // When reading, we'll add it to the folding set of the following template.<br class="">
> - Writer.AddDeclRef(D->getSpecializedTemplate()->getCanonicalDecl(), Record);<br class="">
> + Record.AddDeclRef(D->getSpecializedTemplate()->getCanonicalDecl());<br class="">
> }<br class="">
><br class="">
> Code = serialization::DECL_VAR_TEMPLATE_SPECIALIZATION;<br class="">
> @@ -1431,12 +1437,12 @@ void ASTDeclWriter::VisitVarTemplatePart<br class="">
> VarTemplatePartialSpecializationDecl *D) {<br class="">
> VisitVarTemplateSpecializationDecl(D);<br class="">
><br class="">
> - Writer.AddTemplateParameterList(D->getTemplateParameters(), Record);<br class="">
> - Writer.AddASTTemplateArgumentListInfo(D->getTemplateArgsAsWritten(), Record);<br class="">
> + Record.AddTemplateParameterList(D->getTemplateParameters());<br class="">
> + Record.AddASTTemplateArgumentListInfo(D->getTemplateArgsAsWritten());<br class="">
><br class="">
> // These are read/set from/to the first declaration.<br class="">
> if (D->getPreviousDecl() == nullptr) {<br class="">
> - Writer.AddDeclRef(D->getInstantiatedFromMember(), Record);<br class="">
> + Record.AddDeclRef(D->getInstantiatedFromMember());<br class="">
> Record.push_back(D->isMemberSpecialization());<br class="">
> }<br class="">
><br class="">
> @@ -1446,7 +1452,7 @@ void ASTDeclWriter::VisitVarTemplatePart<br class="">
> void ASTDeclWriter::VisitClassScopeFunctionSpecializationDecl(<br class="">
> ClassScopeFunctionSpecializationDecl *D) {<br class="">
> VisitDecl(D);<br class="">
> - Writer.AddDeclRef(D->getSpecialization(), Record);<br class="">
> + Record.AddDeclRef(D->getSpecialization());<br class="">
> Code = serialization::DECL_CLASS_SCOPE_FUNCTION_SPECIALIZATION;<br class="">
> }<br class="">
><br class="">
> @@ -1468,7 +1474,7 @@ void ASTDeclWriter::VisitTemplateTypePar<br class="">
> !D->defaultArgumentWasInherited();<br class="">
> Record.push_back(OwnsDefaultArg);<br class="">
> if (OwnsDefaultArg)<br class="">
> - Writer.AddTypeSourceInfo(D->getDefaultArgumentInfo(), Record);<br class="">
> + Record.AddTypeSourceInfo(D->getDefaultArgumentInfo());<br class="">
><br class="">
> Code = serialization::DECL_TEMPLATE_TYPE_PARM;<br class="">
> }<br class="">
> @@ -1487,8 +1493,8 @@ void ASTDeclWriter::VisitNonTypeTemplate<br class="">
><br class="">
> if (D->isExpandedParameterPack()) {<br class="">
> for (unsigned I = 0, N = D->getNumExpansionTypes(); I != N; ++I) {<br class="">
> - Writer.AddTypeRef(D->getExpansionType(I), Record);<br class="">
> - Writer.AddTypeSourceInfo(D->getExpansionTypeSourceInfo(I), Record);<br class="">
> + Record.AddTypeRef(D->getExpansionType(I));<br class="">
> + Record.AddTypeSourceInfo(D->getExpansionTypeSourceInfo(I));<br class="">
> }<br class="">
><br class="">
> Code = serialization::DECL_EXPANDED_NON_TYPE_TEMPLATE_PARM_PACK;<br class="">
> @@ -1519,8 +1525,7 @@ void ASTDeclWriter::VisitTemplateTemplat<br class="">
> if (D->isExpandedParameterPack()) {<br class="">
> for (unsigned I = 0, N = D->getNumExpansionTemplateParameters();<br class="">
> I != N; ++I)<br class="">
> - Writer.AddTemplateParameterList(D->getExpansionTemplateParameters(I),<br class="">
> - Record);<br class="">
> + Record.AddTemplateParameterList(D->getExpansionTemplateParameters(I));<br class="">
> Code = serialization::DECL_EXPANDED_TEMPLATE_TEMPLATE_PARM_PACK;<br class="">
> } else {<br class="">
> // Rest of TemplateTemplateParmDecl.<br class="">
> @@ -1529,7 +1534,7 @@ void ASTDeclWriter::VisitTemplateTemplat<br class="">
> !D->defaultArgumentWasInherited();<br class="">
> Record.push_back(OwnsDefaultArg);<br class="">
> if (OwnsDefaultArg)<br class="">
> - Writer.AddTemplateArgumentLoc(D->getDefaultArgument(), Record);<br class="">
> + Record.AddTemplateArgumentLoc(D->getDefaultArgument());<br class="">
> Code = serialization::DECL_TEMPLATE_TEMPLATE_PARM;<br class="">
> }<br class="">
> }<br class="">
> @@ -1544,7 +1549,7 @@ void ASTDeclWriter::VisitStaticAssertDec<br class="">
> Writer.AddStmt(D->getAssertExpr());<br class="">
> Record.push_back(D->isFailed());<br class="">
> Writer.AddStmt(D->getMessage());<br class="">
> - Writer.AddSourceLocation(D->getRParenLoc(), Record);<br class="">
> + Record.AddSourceLocation(D->getRParenLoc());<br class="">
> Code = serialization::DECL_STATIC_ASSERT;<br class="">
> }<br class="">
><br class="">
> @@ -1601,7 +1606,7 @@ void ASTDeclWriter::VisitRedeclarable(Re<br class="">
> assert(isRedeclarableDeclKind(DAsT->getKind()) &&<br class="">
> "Not considered redeclarable?");<br class="">
><br class="">
> - Writer.AddDeclRef(First, Record);<br class="">
> + Record.AddDeclRef(First);<br class="">
><br class="">
> // Write out a list of local redeclarations of this declaration if it's the<br class="">
> // first local declaration in the chain.<br class="">
> @@ -1619,24 +1624,23 @@ void ASTDeclWriter::VisitRedeclarable(Re<br class="">
><br class="">
> // Collect the set of local redeclarations of this declaration, from<br class="">
> // newest to oldest.<br class="">
> - RecordData LocalRedecls;<br class="">
> + ASTWriter::RecordData LocalRedecls;<br class="">
> + ASTRecordWriter LocalRedeclWriter(Record, LocalRedecls);<br class="">
> for (const Decl *Prev = FirstLocal->getMostRecentDecl();<br class="">
> Prev != FirstLocal; Prev = Prev->getPreviousDecl())<br class="">
> if (!Prev->isFromASTFile())<br class="">
> - Writer.AddDeclRef(Prev, LocalRedecls);<br class="">
> + LocalRedeclWriter.AddDeclRef(Prev);<br class="">
><br class="">
> // If we have any redecls, write them now as a separate record preceding<br class="">
> // the declaration itself.<br class="">
> if (LocalRedecls.empty())<br class="">
> Record.push_back(0);<br class="">
> else {<br class="">
> - auto Start = Writer.Stream.GetCurrentBitNo();<br class="">
> - Writer.Stream.EmitRecord(LOCAL_REDECLARATIONS, LocalRedecls);<br class="">
> - AddLocalOffset(Start);<br class="">
> + AddLocalOffset(LocalRedeclWriter.Emit(LOCAL_REDECLARATIONS));<br class="">
> }<br class="">
> } else {<br class="">
> Record.push_back(0);<br class="">
> - Writer.AddDeclRef(FirstLocal, Record);<br class="">
> + Record.AddDeclRef(FirstLocal);<br class="">
> }<br class="">
><br class="">
> // Make sure that we serialize both the previous and the most-recent<br class="">
> @@ -1663,10 +1667,10 @@ void ASTDeclWriter::VisitOMPThreadPrivat<br class="">
><br class="">
> void ASTDeclWriter::VisitOMPDeclareReductionDecl(OMPDeclareReductionDecl *D) {<br class="">
> VisitValueDecl(D);<br class="">
> - Writer.AddSourceLocation(D->getLocStart(), Record);<br class="">
> + Record.AddSourceLocation(D->getLocStart());<br class="">
> Writer.AddStmt(D->getCombiner());<br class="">
> Writer.AddStmt(D->getInitializer());<br class="">
> - Writer.AddDeclRef(D->getPrevDeclInScope(), Record);<br class="">
> + Record.AddDeclRef(D->getPrevDeclInScope());<br class="">
> Code = serialization::DECL_OMP_DECLARE_REDUCTION;<br class="">
> }<br class="">
><br class="">
> @@ -2146,9 +2150,6 @@ void ASTWriter::WriteDecl(ASTContext &Co<br class="">
> // Switch case IDs are per Decl.<br class="">
> ClearSwitchCaseIDs();<br class="">
><br class="">
> - RecordData Record;<br class="">
> - ASTDeclWriter W(*this, Context, Record);<br class="">
> -<br class="">
> // Determine the ID for this declaration.<br class="">
> serialization::DeclID ID;<br class="">
> assert(!D->isFromASTFile() && "should not be emitting imported decl");<br class="">
> @@ -2173,38 +2174,34 @@ void ASTWriter::WriteDecl(ASTContext &Co<br class="">
> VisibleOffset = WriteDeclContextVisibleBlock(Context, DC);<br class="">
> }<br class="">
><br class="">
> + RecordData Record;<br class="">
> + ASTDeclWriter W(*this, Context, Record);<br class="">
> +<br class="">
> // Build a record for this declaration<br class="">
> - Record.clear();<br class="">
> - W.Code = (serialization::DeclCode)0;<br class="">
> - W.AbbrevToUse = 0;<br class="">
> W.Visit(D);<br class="">
> if (DC) W.VisitDeclContext(DC, LexicalOffset, VisibleOffset);<br class="">
><br class="">
> - unsigned Index = ID - FirstDeclID;<br class="">
> + // Emit this declaration to the bitstream.<br class="">
> + uint64_t Offset = W.Emit(D);<br class="">
><br class="">
> // Record the offset for this declaration<br class="">
> SourceLocation Loc = D->getLocation();<br class="">
> + unsigned Index = ID - FirstDeclID;<br class="">
> if (DeclOffsets.size() == Index)<br class="">
> - DeclOffsets.push_back(DeclOffset(Loc, Stream.GetCurrentBitNo()));<br class="">
> + DeclOffsets.push_back(DeclOffset(Loc, Offset));<br class="">
> else if (DeclOffsets.size() < Index) {<br class="">
> + // FIXME: Can/should this happen?<br class="">
> DeclOffsets.resize(Index+1);<br class="">
> DeclOffsets[Index].setLocation(Loc);<br class="">
> - DeclOffsets[Index].BitOffset = Stream.GetCurrentBitNo();<br class="">
> + DeclOffsets[Index].BitOffset = Offset;<br class="">
> + } else {<br class="">
> + llvm_unreachable("declarations should be emitted in ID order");<br class="">
> }<br class="">
><br class="">
> SourceManager &SM = Context.getSourceManager();<br class="">
> if (Loc.isValid() && SM.isLocalSourceLocation(Loc))<br class="">
> associateDeclWithFile(D, ID);<br class="">
><br class="">
> - if (!W.Code)<br class="">
> - llvm::report_fatal_error(StringRef("unexpected declaration kind '") +<br class="">
> - D->getDeclKindName() + "'");<br class="">
> - Stream.EmitRecord(W.Code, Record, W.AbbrevToUse);<br class="">
> -<br class="">
> - // Flush any expressions, base specifiers, and ctor initializers that<br class="">
> - // were written as part of this declaration.<br class="">
> - FlushPendingAfterDecl();<br class="">
> -<br class="">
> // Note declarations that should be deserialized eagerly so that we can add<br class="">
> // them to a record in the AST file later.<br class="">
> if (isRequiredDecl(D, Context, WritingModule))<br class="">
> @@ -2212,7 +2209,7 @@ void ASTWriter::WriteDecl(ASTContext &Co<br class="">
> }<br class="">
><br class="">
> void ASTWriter::AddFunctionDefinition(const FunctionDecl *FD,<br class="">
> - RecordData &Record) {<br class="">
> + RecordDataImpl &Record) {<br class="">
> ClearSwitchCaseIDs();<br class="">
><br class="">
> ASTDeclWriter W(*this, FD->getASTContext(), Record);<br class="">
><br class="">
> Modified: cfe/trunk/lib/Serialization/ASTWriterStmt.cpp<br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterStmt.cpp?rev=265195&r1=265194&r2=265195&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterStmt.cpp?rev=265195&r1=265194&r2=265195&view=diff</a><br class="">
> ==============================================================================<br class="">
> --- cfe/trunk/lib/Serialization/ASTWriterStmt.cpp (original)<br class="">
> +++ cfe/trunk/lib/Serialization/ASTWriterStmt.cpp Fri Apr 1 17:52:03 2016<br class="">
> @@ -112,7 +112,7 @@ void ASTStmtWriter::VisitLabelStmt(Label<br class="">
> void ASTStmtWriter::VisitAttributedStmt(AttributedStmt *S) {<br class="">
> VisitStmt(S);<br class="">
> Record.push_back(S->getAttrs().size());<br class="">
> - Writer.WriteAttributes(S->getAttrs(), Record);<br class="">
> + Writer.AddAttributes(S->getAttrs(), Record);<br class="">
> Writer.AddStmt(S->getSubStmt());<br class="">
> Writer.AddSourceLocation(S->getAttrLoc(), Record);<br class="">
> Code = serialization::STMT_ATTRIBUTED;<br class="">
><br class="">
><br class="">
> _______________________________________________<br class="">
> cfe-commits mailing list<br class="">
> <a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a><br class="">
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br class="">
<br class="">
_______________________________________________<br class="">
cfe-commits mailing list<br class="">
<a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br class="">
</div></div></blockquote></div><br class=""></div>
</div></blockquote></div><br class=""></div></body></html>