diff options
29 files changed, 275 insertions, 301 deletions
diff --git a/include/clang/AST/ASTConsumer.h b/include/clang/AST/ASTConsumer.h index 19cfae56c5..84833c099f 100644 --- a/include/clang/AST/ASTConsumer.h +++ b/include/clang/AST/ASTConsumer.h @@ -50,7 +50,7 @@ public: virtual void HandleTopLevelDecl(DeclGroupRef D); /// HandleInterestingDecl - Handle the specified interesting declaration. This - /// is called by the PCH reader when deserializing things that might interest + /// is called by the AST reader when deserializing things that might interest /// the consumer. The default implementation forwards to HandleTopLevelDecl. virtual void HandleInterestingDecl(DeclGroupRef D); diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h index 83270ab727..34092c7993 100644 --- a/include/clang/AST/DeclBase.h +++ b/include/clang/AST/DeclBase.h @@ -226,8 +226,8 @@ protected: /// PCHLevel - the "level" of AST file from which this declaration was built. unsigned PCHLevel : 2; - /// PCHChanged - if this declaration has changed since being deserialized - bool PCHChanged : 1; + /// ChangedAfterLoad - if this declaration has changed since being loaded + bool ChangedAfterLoad : 1; /// IdentifierNamespace - This specifies what IDNS_* namespace this lives in. unsigned IdentifierNamespace : 15; @@ -245,7 +245,7 @@ protected: : NextDeclInContext(0), DeclCtx(DC), Loc(L), DeclKind(DK), InvalidDecl(0), HasAttrs(false), Implicit(false), Used(false), - Access(AS_none), PCHLevel(0), PCHChanged(false), + Access(AS_none), PCHLevel(0), ChangedAfterLoad(false), IdentifierNamespace(getIdentifierNamespaceForKind(DK)) { if (Decl::CollectingStats()) add(DK); } @@ -253,7 +253,7 @@ protected: Decl(Kind DK, EmptyShell Empty) : NextDeclInContext(0), DeclKind(DK), InvalidDecl(0), HasAttrs(false), Implicit(false), Used(false), - Access(AS_none), PCHLevel(0), PCHChanged(false), + Access(AS_none), PCHLevel(0), ChangedAfterLoad(false), IdentifierNamespace(getIdentifierNamespaceForKind(DK)) { if (Decl::CollectingStats()) add(DK); } @@ -380,11 +380,10 @@ public: /// declaration was generated. /// /// The PCH level of a declaration describes where the declaration originated - /// from. A PCH level of 0 indicates that the declaration was not from a - /// precompiled header. A PCH level of 1 indicates that the declaration was - /// from a top-level precompiled header; 2 indicates that the declaration - /// comes from a precompiled header on which the top-level precompiled header - /// depends, and so on. + /// from. A PCH level of 0 indicates that the declaration was parsed from + /// source. A PCH level of 1 indicates that the declaration was loaded from + /// a top-level AST file. A PCH level 2 indicates that the declaration was + /// loaded from a PCH file the AST file depends on, and so on. unsigned getPCHLevel() const { return PCHLevel; } /// \brief The maximum PCH level that any declaration may have. @@ -401,11 +400,13 @@ public: /// /// In an epic violation of layering, what is "significant" is entirely /// up to the serialization system, but implemented in AST and Sema. - bool isChangedSinceDeserialization() const { return PCHChanged; } + bool isChangedSinceDeserialization() const { return ChangedAfterLoad; } /// \brief Mark this declaration as having changed since deserialization, or /// reset the flag. - void setChangedSinceDeserialization(bool Changed) { PCHChanged = Changed; } + void setChangedSinceDeserialization(bool Changed) { + ChangedAfterLoad = Changed; + } unsigned getIdentifierNamespace() const { return IdentifierNamespace; diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h index 1cc0e3926e..a2f08b75fa 100644 --- a/include/clang/AST/Type.h +++ b/include/clang/AST/Type.h @@ -787,12 +787,12 @@ private: /// \brief Linkage of this type. mutable unsigned CachedLinkage : 2; - /// \brief FromPCH - Whether this type comes from a PCH file. - mutable bool FromPCH : 1; + /// \brief FromAST - Whether this type comes from an AST file. + mutable bool FromAST : 1; - /// \brief Set whether this type comes from a PCH file. - void setFromPCH(bool V = true) const { - FromPCH = V; + /// \brief Set whether this type comes from an AST file. + void setFromAST(bool V = true) const { + FromAST = V; } protected: @@ -806,15 +806,15 @@ protected: Type(TypeClass tc, QualType Canonical, bool dependent) : CanonicalType(Canonical.isNull() ? QualType(this_(), 0) : Canonical), TC(tc), Dependent(dependent), LinkageKnown(false), - CachedLinkage(NoLinkage), FromPCH(false) {} + CachedLinkage(NoLinkage), FromAST(false) {} virtual ~Type(); friend class ASTContext; public: TypeClass getTypeClass() const { return static_cast<TypeClass>(TC); } - /// \brief Whether this type comes from a PCH file. - bool isFromPCH() const { return FromPCH; } + /// \brief Whether this type comes from an AST file. + bool isFromAST() const { return FromAST; } bool isCanonicalUnqualified() const { return CanonicalType.getTypePtr() == this; @@ -1856,13 +1856,13 @@ class FunctionType : public Type { // * FunctionNoProtoType::Profile // * FunctionProtoType::Profile // * TypePrinter::PrintFunctionProto - // * PCH read and write + // * AST read and write // * Codegen class ExtInfo { public: // Constructor with no defaults. Use this when you know that you - // have all the elements (when reading a PCH file for example). + // have all the elements (when reading an AST file for example). ExtInfo(bool noReturn, unsigned regParm, CallingConv cc) : NoReturn(noReturn), RegParm(regParm), CC(cc) {} diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h index fa1b149e39..24fe086a79 100644 --- a/include/clang/Basic/IdentifierTable.h +++ b/include/clang/Basic/IdentifierTable.h @@ -59,8 +59,8 @@ class IdentifierInfo { bool IsPoisoned : 1; // True if identifier is poisoned. bool IsCPPOperatorKeyword : 1; // True if ident is a C++ operator keyword. bool NeedsHandleIdentifier : 1; // See "RecomputeNeedsHandleIdentifier". - bool IsFromPCH : 1; // True if identfier first appeared in a PCH - // and wasn't modified since. + bool IsFromAST : 1; // True if identfier first appeared in an AST + // file and wasn't modified since. bool RevertedTokenID : 1; // True if RevertTokenIDToIdentifier was // called. // 7 bits left in 32-bit word. @@ -129,7 +129,7 @@ public: NeedsHandleIdentifier = 1; else RecomputeNeedsHandleIdentifier(); - IsFromPCH = false; + IsFromAST = false; } /// getTokenID - If this is a source-language token (e.g. 'for'), this API @@ -145,7 +145,7 @@ public: /// /// TokenID is normally read-only but there are 2 instances where we revert it /// to tok::identifier for libstdc++ 4.2. Keep track of when this happens - /// using this method so we can inform PCH about it. + /// using this method so we can inform serialization about it. void RevertTokenIDToIdentifier() { assert(TokenID != tok::identifier && "Already at tok::identifier"); TokenID = tok::identifier; @@ -205,7 +205,7 @@ public: NeedsHandleIdentifier = 1; else RecomputeNeedsHandleIdentifier(); - IsFromPCH = false; + IsFromAST = false; } /// isPoisoned - Return true if this token has been poisoned. @@ -233,11 +233,11 @@ public: /// know that HandleIdentifier will not affect the token. bool isHandleIdentifierCase() const { return NeedsHandleIdentifier; } - /// isFromPCH - Return true if the identifier in its current state was loaded - /// from a PCH file. - bool isFromPCH() const { return IsFromPCH; } + /// isFromAST - Return true if the identifier in its current state was loaded + /// from an AST file. + bool isFromAST() const { return IsFromAST; } - void setIsFromPCH(bool FromPCH = true) { IsFromPCH = FromPCH; } + void setIsFromAST(bool FromAST = true) { IsFromAST = FromAST; } private: /// RecomputeNeedsHandleIdentifier - The Preprocessor::HandleIdentifier does diff --git a/include/clang/Basic/Linkage.h b/include/clang/Basic/Linkage.h index 035b4fc7a7..01b6c79042 100644 --- a/include/clang/Basic/Linkage.h +++ b/include/clang/Basic/Linkage.h @@ -42,7 +42,7 @@ enum Linkage { }; /// \brief A more specific kind of linkage. This is relevant to CodeGen and -/// PCH reading. +/// AST file reading. enum GVALinkage { GVA_Internal, GVA_C99Inline, diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h index dc314f1f07..91ade22985 100644 --- a/include/clang/Basic/SourceManager.h +++ b/include/clang/Basic/SourceManager.h @@ -795,7 +795,7 @@ public: unsigned sloc_entry_size() const { return SLocEntryTable.size(); } // FIXME: Exposing this is a little gross; what we want is a good way - // to iterate the entries that were not defined in a PCH file (or + // to iterate the entries that were not defined in an AST file (or // any other external source). unsigned sloc_loaded_entry_size() const { return SLocEntryLoaded.size(); } diff --git a/include/clang/Frontend/ASTUnit.h b/include/clang/Frontend/ASTUnit.h index 6e67aafb4c..60e06bbd3e 100644 --- a/include/clang/Frontend/ASTUnit.h +++ b/include/clang/Frontend/ASTUnit.h @@ -53,7 +53,7 @@ class TargetInfo; using namespace idx; -/// \brief Utility class for loading a ASTContext from a PCH file. +/// \brief Utility class for loading a ASTContext from an AST file. /// class ASTUnit { public: @@ -196,7 +196,7 @@ private: /// \brief The group of timers associated with this translation unit. llvm::OwningPtr<llvm::TimerGroup> TimerGroup; - /// \brief A list of the PCH ID numbers for each of the top-level + /// \brief A list of the serialization ID numbers for each of the top-level /// declarations parsed within the precompiled preamble. std::vector<pch::DeclID> TopLevelDeclsInPreamble; @@ -358,7 +358,7 @@ public: FileManager &getFileManager() { return *FileMgr; } const std::string &getOriginalSourceFileName(); - const std::string &getPCHFileName(); + const std::string &getASTFileName(); /// \brief Add a temporary file that the ASTUnit depends on. /// @@ -458,15 +458,15 @@ public: /// remapped contents of that file. typedef std::pair<std::string, const llvm::MemoryBuffer *> RemappedFile; - /// \brief Create a ASTUnit from a PCH file. + /// \brief Create a ASTUnit from an AST file. /// - /// \param Filename - The PCH file to load. + /// \param Filename - The AST file to load. /// /// \param Diags - The diagnostics engine to use for reporting errors; its /// lifetime is expected to extend past that of the returned ASTUnit. /// - /// \returns - The initialized ASTUnit or null if the PCH failed to load. - static ASTUnit *LoadFromPCHFile(const std::string &Filename, + /// \returns - The initialized ASTUnit or null if the AST failed to load. + static ASTUnit *LoadFromASTFile(const std::string &Filename, llvm::IntrusiveRefCntPtr<Diagnostic> Diags, bool OnlyLocalDecls = false, RemappedFile *RemappedFiles = 0, diff --git a/include/clang/Frontend/FrontendAction.h b/include/clang/Frontend/FrontendAction.h index 637458da34..773543ac06 100644 --- a/include/clang/Frontend/FrontendAction.h +++ b/include/clang/Frontend/FrontendAction.h @@ -145,8 +145,8 @@ public: /// @{ /// usesPreprocessorOnly - Does this action only use the preprocessor? If so - /// no AST context will be created and this action will be invalid with PCH - /// inputs. + /// no AST context will be created and this action will be invalid with AST + /// file inputs. virtual bool usesPreprocessorOnly() const = 0; /// usesCompleteTranslationUnit - For AST based actions, should the diff --git a/include/clang/Frontend/FrontendOptions.h b/include/clang/Frontend/FrontendOptions.h index d526a94b77..4c16d084fc 100644 --- a/include/clang/Frontend/FrontendOptions.h +++ b/include/clang/Frontend/FrontendOptions.h @@ -60,10 +60,10 @@ public: /// completion results. unsigned DisableFree : 1; ///< Disable memory freeing on exit. unsigned RelocatablePCH : 1; ///< When generating PCH files, - /// instruct the PCH writer to create + /// instruct the AST writer to create /// relocatable PCH files. unsigned ChainedPCH : 1; ///< When generating PCH files, - /// instruct the PCH writer to create + /// instruct the AST writer to create /// chained PCH files. unsigned ShowHelp : 1; ///< Show the -help text. unsigned ShowMacrosInCodeCompletion : 1; ///< Show macros in code completion diff --git a/include/clang/Lex/MacroInfo.h b/include/clang/Lex/MacroInfo.h index 009ec20f41..90f95b7ace 100644 --- a/include/clang/Lex/MacroInfo.h +++ b/include/clang/Lex/MacroInfo.h @@ -62,8 +62,8 @@ class MacroInfo { /// it has not yet been redefined or undefined. bool IsBuiltinMacro : 1; - /// IsFromPCH - True if this macro was loaded from a PCH file. - bool IsFromPCH : 1; + /// IsFromAST - True if this macro was loaded from an AST file. + bool IsFromAST : 1; private: //===--------------------------------------------------------------------===// @@ -185,11 +185,11 @@ public: /// __LINE__, which requires processing before expansion. bool isBuiltinMacro() const { return IsBuiltinMacro; } - /// isFromPCH - Return true if this macro was loaded from a PCH file. - bool isFromPCH() const { return IsFromPCH; } + /// isFromAST - Return true if this macro was loaded from an AST file. + bool isFromAST() const { return IsFromAST; } - /// setIsFromPCH - Set whether this macro was loaded from a PCH file. - void setIsFromPCH(bool FromPCH = true) { IsFromPCH = FromPCH; } + /// setIsFromAST - Set whether this macro was loaded from an AST file. + void setIsFromAST(bool FromAST = true) { IsFromAST = FromAST; } /// isUsed - Return false if this macro is defined in the main file and has /// not yet been used. diff --git a/include/clang/Sema/IdentifierResolver.h b/include/clang/Sema/IdentifierResolver.h index 59bd834073..e494792c54 100644 --- a/include/clang/Sema/IdentifierResolver.h +++ b/include/clang/Sema/IdentifierResolver.h @@ -169,7 +169,7 @@ public: /// \brief Link the declaration into the chain of declarations for /// the given identifier. /// - /// This is a lower-level routine used by the PCH reader to link a + /// This is a lower-level routine used by the AST reader to link a /// declaration into a specific IdentifierInfo before the /// declaration actually has a name. void AddDeclToIdentifierChain(IdentifierInfo *II, NamedDecl *D); diff --git a/include/clang/Serialization/PCHDeserializationListener.h b/include/clang/Serialization/PCHDeserializationListener.h index ec02bf457f..024fc5a5d9 100644 --- a/include/clang/Serialization/PCHDeserializationListener.h +++ b/include/clang/Serialization/PCHDeserializationListener.h @@ -31,14 +31,15 @@ public: /// \brief Tell the listener about the reader. virtual void SetReader(ASTReader *Reader) = 0; - /// \brief An identifier was deserialized from the PCH. + /// \brief An identifier was deserialized from the AST file. virtual void IdentifierRead(pch::IdentID ID, IdentifierInfo *II) = 0; - /// \brief A type was deserialized from the PCH. The ID here has the qualifier - /// bits already removed, and T is guaranteed to be locally unqualified + /// \brief A type was deserialized from the AST file. The ID here has the + /// qualifier bits already removed, and T is guaranteed to be locally + /// unqualified. virtual void TypeRead(pch::TypeID ID, QualType T) = 0; - /// \brief A decl was deserialized from the PCH. + /// \brief A decl was deserialized from the AST file. virtual void DeclRead(pch::DeclID ID, const Decl *D) = 0; - /// \brief A selector was read from the PCH. + /// \brief A selector was read from the AST file. virtual void SelectorRead(pch::SelectorID iD, Selector Sel) = 0; }; diff --git a/include/clang/Serialization/PCHReader.h b/include/clang/Serialization/PCHReader.h index 5ce45b7db5..5d24b297ae 100644 --- a/include/clang/Serialization/PCHReader.h +++ b/include/clang/Serialization/PCHReader.h @@ -104,8 +104,8 @@ public: /// /// \param Buffers Information about the predefines buffers. /// - /// \param OriginalFileName The original file name for the PCH, which will - /// appear as an entry in the predefines buffer. + /// \param OriginalFileName The original file name for the AST file, which + /// will appear as an entry in the predefines buffer. /// /// \param SuggestedPredefines If necessary, additional definitions are added /// here. @@ -183,13 +183,13 @@ private: Diagnostic &Diags; /// \brief The semantic analysis object that will be processing the - /// PCH files and the translation unit that uses it. + /// AST files and the translation unit that uses it. Sema *SemaObj; /// \brief The preprocessor that will be loading the source file. Preprocessor *PP; - /// \brief The AST context into which we'll read the PCH files. + /// \brief The AST context into which we'll read the AST files. ASTContext *Context; /// \brief The AST consumer. @@ -199,12 +199,12 @@ private: struct PerFileData { PerFileData(); - /// \brief The PCH stat cache installed for this file, if any. + /// \brief The AST stat cache installed for this file, if any. /// - /// The dynamic type of this stat cache is always PCHStatCache + /// The dynamic type of this stat cache is always ASTStatCache void *StatCache; - /// \brief The bitstream reader from which we'll read the PCH file. + /// \brief The bitstream reader from which we'll read the AST file. llvm::BitstreamReader StreamFile; llvm::BitstreamCursor Stream; @@ -220,38 +220,38 @@ private: /// jump around with these in context. llvm::BitstreamCursor DeclsCursor; - /// \brief The file name of the PCH file. + /// \brief The file name of the AST file. std::string FileName; /// \brief The memory buffer that stores the data associated with - /// this PCH file. + /// this AST file. llvm::OwningPtr<llvm::MemoryBuffer> Buffer; /// \brief Cursor used to read source location entries. llvm::BitstreamCursor SLocEntryCursor; - /// \brief The number of source location entries in this PCH file. + /// \brief The number of source location entries in this AST file. unsigned LocalNumSLocEntries; /// \brief Offsets for all of the source location entries in the - /// PCH file. + /// AST file. const uint32_t *SLocOffsets; - /// \brief The number of types in this PCH file. + /// \brief The number of types in this AST file. unsigned LocalNumTypes; /// \brief Offset of each type within the bitstream, indexed by the /// type ID, or the representation of a Type*. const uint32_t *TypeOffsets; - /// \brief The number of declarations in this PCH file. + /// \brief The number of declarations in this AST file. unsigned LocalNumDecls; /// \brief Offset of each declaration within the bitstream, indexed /// by the declaration ID (-1). const uint32_t *DeclOffsets; - /// \brief The number of identifiers in this PCH file. + /// \brief The number of identifiers in this AST file. unsigned LocalNumIdentifiers; /// \brief Offsets into the identifier table data. @@ -275,7 +275,7 @@ private: unsigned LocalNumMacroDefinitions; /// \brief Offsets of all of the macro definitions in the preprocessing - /// record in the PCH file. + /// record in the AST file. const uint32_t *MacroDefinitionOffsets; /// \brief The number of preallocated preprocessing entities in the @@ -283,7 +283,7 @@ private: unsigned NumPreallocatedPreprocessingEntities; /// \brief A pointer to an on-disk hash table of opaque type - /// PCHSelectorLookupTable. + /// ASTSelectorLookupTable. /// /// This hash table provides the IDs of all selectors, and the associated /// instance and factory methods. @@ -304,18 +304,18 @@ private: unsigned LocalNumSelectors; }; - /// \brief The chain of PCH files. The first entry is the one named by the + /// \brief The chain of AST files. The first entry is the one named by the /// user, the last one is the one that doesn't depend on anything further. /// That is, the entry I was created with -include-pch I+1. llvm::SmallVector<PerFileData*, 2> Chain; - /// \brief Types that have already been loaded from the PCH file. + /// \brief Types that have already been loaded from the chain. /// /// When the pointer at index I is non-NULL, the type with - /// ID = (I + 1) << FastQual::Width has already been loaded from the PCH chain + /// ID = (I + 1) << FastQual::Width has already been loaded std::vector<QualType> TypesLoaded; - /// \brief Declarations that have already been loaded from the PCH file. + /// \brief Declarations that have already been loaded from the chain. /// /// When the pointer at index I is non-NULL, the declaration with ID /// = I + 1 has already been loaded. @@ -343,7 +343,7 @@ private: typedef llvm::DenseMap<pch::DeclID, pch::DeclID> FirstLatestDeclIDMap; /// \brief Map of first declarations from a chained PCH that point to the - /// most recent declarations in another PCH. + /// most recent declarations in another AST file. FirstLatestDeclIDMap FirstLatestDeclIDs; /// \brief Read the records that describe the contents of declcontexts. @@ -373,49 +373,45 @@ private: /// \brief The macro definitions we have already loaded. llvm::SmallVector<MacroDefinition *, 16> MacroDefinitionsLoaded; - /// \brief The set of external definitions stored in the the PCH - /// file. + /// \brief The set of external definitions stored in the the chain. llvm::SmallVector<uint64_t, 16> ExternalDefinitions; - /// \brief The set of tentative definitions stored in the the PCH - /// file. + /// \brief The set of tentative definitions stored in the the chain. llvm::SmallVector<uint64_t, 16> TentativeDefinitions; - /// \brief The set of unused file scoped decls stored in the the PCH file. + /// \brief The set of unused file scoped decls stored in the the chain. llvm::SmallVector<uint64_t, 16> UnusedFileScopedDecls; - /// \brief The set of weak undeclared identifiers stored in the the PCH file. + /// \brief The set of weak undeclared identifiers stored in the chain. llvm::SmallVector<uint64_t, 64> WeakUndeclaredIdentifiers; - /// \brief The set of locally-scoped external declarations stored in - /// the the PCH file. + /// \brief The set of locally-scoped external declarations stored in the chain llvm::SmallVector<uint64_t, 16> LocallyScopedExternalDecls; - /// \brief The set of ext_vector type declarations stored in the the - /// PCH file. + /// \brief The set of ext_vector type declarations stored in the the chain. llvm::SmallVector<uint64_t, 4> ExtVectorDecls; - /// \brief The set of VTable uses of CXXRecordDecls stored in the PCH file. + /// \brief The set of VTable uses of CXXRecordDecls stored in the chain. llvm::SmallVector<uint64_t, 64> VTableUses; - /// \brief The set of dynamic CXXRecord declarations stored in the PCH file. + /// \brief The set of dynamic CXXRecord declarations stored in the chain. llvm::SmallVector<uint64_t, 16> DynamicClasses; - /// \brief The set of pending implicit instantiations stored in the PCH file. + /// \brief The set of pending implicit instantiations stored in the chain. llvm::SmallVector<uint64_t, 64> PendingImplicitInstantiations; - /// \brief The set of Sema declaration references, stored in PCH. + /// \brief The set of Sema declaration references stored in the chain. llvm::SmallVector<uint64_t, 4> SemaDeclRefs; - /// \brief The set of Objective-C category definitions stored in the - /// the PCH file. + /// \brief The set of Objective-C category definitions stored in the the chain llvm::SmallVector<uint64_t, 4> ObjCCategoryImpls; - /// \brief The original file name that was used to build the PCH file, which - /// may have been modified for relocatable-pch support. + /// \brief The original file name that was used to build the primary AST file, + /// which may have been modified for relocatable-pch support. std::string OriginalFileName; - /// \brief The actual original file name that was used to build the PCH file. + /// \brief The actual original file name that was used to build the primary + /// AST file. std::string ActualOriginalFileName; /// \brief Whether this precompiled header is a relocatable PCH file. @@ -429,12 +425,10 @@ private: /// headers when they are loaded. bool DisableValidation; - /// \brief Mapping from switch-case IDs in the PCH file to - /// switch-case statements. + /// \brief Mapping from switch-case IDs in the chain to switch-case statements std::map<unsigned, SwitchCase *> SwitchCaseStmts; - /// \brief Mapping from label statement IDs in the PCH file to label - /// statements. + /// \brief Mapping from label statement IDs in the chain to label statements. std::map<unsigned, LabelStmt *> LabelStmts; /// \brief Mapping from label IDs to the set of "goto" statements @@ -455,21 +449,21 @@ private: /// the PCH file. unsigned NumSLocEntriesRead; - /// \brief The number of source location entries in all PCH files. + /// \brief The number of source location entries in the chain. unsigned TotalNumSLocEntries; /// \brief The number of statements (and expressions) de-serialized - /// from the PCH file. + /// from the chain. unsigned NumStatementsRead; /// \brief The total number of statements (and expressions) stored - /// in the PCH file. + /// in the chain. unsigned TotalNumStatements; - /// \brief The number of macros de-serialized from the PCH file. + /// \brief The number of macros de-serialized from the chain. unsigned NumMacrosRead; - /// \brief The total number of macros stored in the PCH file. + /// \brief The total number of macros stored in the chain. unsigned TotalNumMacros; /// \brief The number of selectors that have been read. @@ -501,7 +495,7 @@ private: llvm::SmallVector<uint32_t, 4> DeclIDs; }; - /// \brief The set of identifiers that were read while the PCH reader was + /// \brief The set of identifiers that were read while the AST reader was /// (recursively) loading declarations. /// /// The declarations on the identifier chain for these identifiers will be @@ -547,7 +541,7 @@ private: ~ReadingKindTracker() { Reader.ReadingKind = PrevKind; } }; - /// \brief All predefines buffers in all PCH files, to be treated as if + /// \brief All predefines buffers in the chain, to be treated as if /// concatenated. PCHPredefinesBlocks PCHPredefinesBuffers; @@ -588,7 +582,7 @@ private: /// \brief Produce an error diagnostic and return true. /// /// This routine should only be used for fatal errors that have to - /// do with non-routine failures (e.g., corrupted PCH file). + /// do with non-routine failures (e.g., corrupted AST file). void Error(const char *Msg); ASTReader(const ASTReader&); // do not implement @@ -596,7 +590,7 @@ private: public: typedef llvm::SmallVector<uint64_t, 64> RecordData; - /// \brief Load the PCH file and validate its contents against the given + /// \brief Load the AST file and validate its contents against the given /// Preprocessor. /// /// \param PP the preprocessor associated with the context in which this @@ -609,31 +603,29 @@ public: |