Author: Chuanqi Xu Date: 2024-05-13T14:05:02+08:00 New Revision: e74a34b6932965dfdc182b69f779e5bee551585a
URL: https://github.com/llvm/llvm-project/commit/e74a34b6932965dfdc182b69f779e5bee551585a DIFF: https://github.com/llvm/llvm-project/commit/e74a34b6932965dfdc182b69f779e5bee551585a.diff LOG: [NFC] [Serialization] Merge IdentID with IdentifierID In ASTBitCodes.h, there are two type alias for the ID type of Identifiers with the same underlying type. It is confusing. This patch tries to merge the `IdentID` to `IdentifierID` to erase such confusion. Added: Modified: clang/include/clang/Frontend/MultiplexConsumer.h clang/include/clang/Serialization/ASTBitCodes.h clang/include/clang/Serialization/ASTDeserializationListener.h clang/include/clang/Serialization/ASTReader.h clang/include/clang/Serialization/ASTWriter.h clang/include/clang/Serialization/ModuleFile.h clang/lib/Frontend/FrontendAction.cpp clang/lib/Frontend/MultiplexConsumer.cpp clang/lib/Serialization/ASTReader.cpp clang/lib/Serialization/ASTReaderInternals.h clang/lib/Serialization/ASTWriter.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Frontend/MultiplexConsumer.h b/clang/include/clang/Frontend/MultiplexConsumer.h index f29c8e92fded0..4ed0d86d3cdfb 100644 --- a/clang/include/clang/Frontend/MultiplexConsumer.h +++ b/clang/include/clang/Frontend/MultiplexConsumer.h @@ -32,7 +32,7 @@ class MultiplexASTDeserializationListener : public ASTDeserializationListener { MultiplexASTDeserializationListener( const std::vector<ASTDeserializationListener *> &L); void ReaderInitialized(ASTReader *Reader) override; - void IdentifierRead(serialization::IdentID ID, IdentifierInfo *II) override; + void IdentifierRead(serialization::IdentifierID ID, IdentifierInfo *II) override; void MacroRead(serialization::MacroID ID, MacroInfo *MI) override; void TypeRead(serialization::TypeIdx Idx, QualType T) override; void DeclRead(GlobalDeclID ID, const Decl *D) override; diff --git a/clang/include/clang/Serialization/ASTBitCodes.h b/clang/include/clang/Serialization/ASTBitCodes.h index ae9521e427099..d3538e43d3d78 100644 --- a/clang/include/clang/Serialization/ASTBitCodes.h +++ b/clang/include/clang/Serialization/ASTBitCodes.h @@ -61,6 +61,9 @@ const unsigned VERSION_MINOR = 1; /// and start at 1. 0 is reserved for NULL. using IdentifierID = uint32_t; +/// The number of predefined identifier IDs. +const unsigned int NUM_PREDEF_IDENT_IDS = 1; + /// An ID number that refers to a declaration in an AST file. See the comments /// in DeclIDBase for details. using DeclID = DeclIDBase::DeclID; @@ -123,12 +126,6 @@ struct UnsafeQualTypeDenseMapInfo { } }; -/// An ID number that refers to an identifier in an AST file. -using IdentID = uint32_t; - -/// The number of predefined identifier IDs. -const unsigned int NUM_PREDEF_IDENT_IDS = 1; - /// An ID number that refers to a macro in an AST file. using MacroID = uint32_t; diff --git a/clang/include/clang/Serialization/ASTDeserializationListener.h b/clang/include/clang/Serialization/ASTDeserializationListener.h index 3ab7f1a91843b..1d81a9ae3fe2e 100644 --- a/clang/include/clang/Serialization/ASTDeserializationListener.h +++ b/clang/include/clang/Serialization/ASTDeserializationListener.h @@ -35,7 +35,7 @@ class ASTDeserializationListener { virtual void ReaderInitialized(ASTReader *Reader) { } /// An identifier was deserialized from the AST file. - virtual void IdentifierRead(serialization::IdentID ID, + virtual void IdentifierRead(serialization::IdentifierID ID, IdentifierInfo *II) { } /// A macro was read from the AST file. virtual void MacroRead(serialization::MacroID ID, MacroInfo *MI) { } diff --git a/clang/include/clang/Serialization/ASTReader.h b/clang/include/clang/Serialization/ASTReader.h index e24fa121528f3..1bb5fa27a2419 100644 --- a/clang/include/clang/Serialization/ASTReader.h +++ b/clang/include/clang/Serialization/ASTReader.h @@ -667,7 +667,7 @@ class ASTReader std::vector<IdentifierInfo *> IdentifiersLoaded; using GlobalIdentifierMapType = - ContinuousRangeMap<serialization::IdentID, ModuleFile *, 4>; + ContinuousRangeMap<serialization::IdentifierID, ModuleFile *, 4>; /// Mapping from global identifier IDs to the module in which the /// identifier resides along with the offset that should be added to the diff --git a/clang/include/clang/Serialization/ASTWriter.h b/clang/include/clang/Serialization/ASTWriter.h index 482e9dd168cc3..7bb0e81545bd1 100644 --- a/clang/include/clang/Serialization/ASTWriter.h +++ b/clang/include/clang/Serialization/ASTWriter.h @@ -277,10 +277,10 @@ class ASTWriter : public ASTDeserializationListener, std::vector<serialization::UnalignedUInt64> TypeOffsets; /// The first ID number we can use for our own identifiers. - serialization::IdentID FirstIdentID = serialization::NUM_PREDEF_IDENT_IDS; + serialization::IdentifierID FirstIdentID = serialization::NUM_PREDEF_IDENT_IDS; /// The identifier ID that will be assigned to the next new identifier. - serialization::IdentID NextIdentID = FirstIdentID; + serialization::IdentifierID NextIdentID = FirstIdentID; /// Map that provides the ID numbers of each identifier in /// the output stream. @@ -288,7 +288,7 @@ class ASTWriter : public ASTDeserializationListener, /// The ID numbers for identifiers are consecutive (in order of /// discovery), starting at 1. An ID of zero refers to a NULL /// IdentifierInfo. - llvm::MapVector<const IdentifierInfo *, serialization::IdentID> IdentifierIDs; + llvm::MapVector<const IdentifierInfo *, serialization::IdentifierID> IdentifierIDs; /// The first ID number we can use for our own macros. serialization::MacroID FirstMacroID = serialization::NUM_PREDEF_MACRO_IDS; @@ -698,7 +698,7 @@ class ASTWriter : public ASTDeserializationListener, serialization::SelectorID getSelectorRef(Selector Sel); /// Get the unique number used to refer to the given identifier. - serialization::IdentID getIdentifierRef(const IdentifierInfo *II); + serialization::IdentifierID getIdentifierRef(const IdentifierInfo *II); /// Get the unique number used to refer to the given macro. serialization::MacroID getMacroRef(MacroInfo *MI, const IdentifierInfo *Name); @@ -855,7 +855,7 @@ class ASTWriter : public ASTDeserializationListener, private: // ASTDeserializationListener implementation void ReaderInitialized(ASTReader *Reader) override; - void IdentifierRead(serialization::IdentID ID, IdentifierInfo *II) override; + void IdentifierRead(serialization::IdentifierID ID, IdentifierInfo *II) override; void MacroRead(serialization::MacroID ID, MacroInfo *MI) override; void TypeRead(serialization::TypeIdx Idx, QualType T) override; void SelectorRead(serialization::SelectorID ID, Selector Sel) override; diff --git a/clang/include/clang/Serialization/ModuleFile.h b/clang/include/clang/Serialization/ModuleFile.h index 8e0fce1fd48ce..7d8cbe3d40f56 100644 --- a/clang/include/clang/Serialization/ModuleFile.h +++ b/clang/include/clang/Serialization/ModuleFile.h @@ -308,7 +308,7 @@ class ModuleFile { const uint32_t *IdentifierOffsets = nullptr; /// Base identifier ID for identifiers local to this module. - serialization::IdentID BaseIdentifierID = 0; + serialization::IdentifierID BaseIdentifierID = 0; /// Remapping table for identifier IDs in this module. ContinuousRangeMap<uint32_t, int, 2> IdentifierRemap; diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp index 9ae7664b4b49d..a9c45e525c696 100644 --- a/clang/lib/Frontend/FrontendAction.cpp +++ b/clang/lib/Frontend/FrontendAction.cpp @@ -71,7 +71,7 @@ class DelegatingDeserializationListener : public ASTDeserializationListener { if (Previous) Previous->ReaderInitialized(Reader); } - void IdentifierRead(serialization::IdentID ID, + void IdentifierRead(serialization::IdentifierID ID, IdentifierInfo *II) override { if (Previous) Previous->IdentifierRead(ID, II); diff --git a/clang/lib/Frontend/MultiplexConsumer.cpp b/clang/lib/Frontend/MultiplexConsumer.cpp index c74bfd86195fe..8fdc7f55a5003 100644 --- a/clang/lib/Frontend/MultiplexConsumer.cpp +++ b/clang/lib/Frontend/MultiplexConsumer.cpp @@ -35,7 +35,7 @@ void MultiplexASTDeserializationListener::ReaderInitialized( } void MultiplexASTDeserializationListener::IdentifierRead( - serialization::IdentID ID, IdentifierInfo *II) { + serialization::IdentifierID ID, IdentifierInfo *II) { for (size_t i = 0, e = Listeners.size(); i != e; ++i) Listeners[i]->IdentifierRead(ID, II); } diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 78e4df440641e..7627996d2c322 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -1005,7 +1005,7 @@ static bool readBit(unsigned &Bits) { return Value; } -IdentID ASTIdentifierLookupTrait::ReadIdentifierID(const unsigned char *d) { +IdentifierID ASTIdentifierLookupTrait::ReadIdentifierID(const unsigned char *d) { using namespace llvm::support; unsigned RawID = endian::readNext<uint32_t, llvm::endianness::little>(d); @@ -1041,7 +1041,7 @@ IdentifierInfo *ASTIdentifierLookupTrait::ReadData(const internal_key_type& k, markIdentifierFromAST(Reader, *II); Reader.markIdentifierUpToDate(II); - IdentID ID = Reader.getGlobalIdentifierID(F, RawID); + IdentifierID ID = Reader.getGlobalIdentifierID(F, RawID); if (!IsInteresting) { // For uninteresting identifiers, there's nothing else to do. Just notify // the reader that we've finished loading this identifier. diff --git a/clang/lib/Serialization/ASTReaderInternals.h b/clang/lib/Serialization/ASTReaderInternals.h index 49268ad5251df..536b19f91691e 100644 --- a/clang/lib/Serialization/ASTReaderInternals.h +++ b/clang/lib/Serialization/ASTReaderInternals.h @@ -175,7 +175,7 @@ class ASTIdentifierLookupTrait : public ASTIdentifierLookupTraitBase { const unsigned char* d, unsigned DataLen); - IdentID ReadIdentifierID(const unsigned char *d); + IdentifierID ReadIdentifierID(const unsigned char *d); ASTReader &getReader() const { return Reader; } }; diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index ab07cf3efa45d..6154ead589d3e 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -3746,7 +3746,7 @@ class ASTIdentifierTableTrait { using key_type = const IdentifierInfo *; using key_type_ref = key_type; - using data_type = IdentID; + using data_type = IdentifierID; using data_type_ref = data_type; using hash_value_type = unsigned; @@ -3775,7 +3775,7 @@ class ASTIdentifierTableTrait { } std::pair<unsigned, unsigned> - EmitKeyDataLength(raw_ostream &Out, const IdentifierInfo *II, IdentID ID) { + EmitKeyDataLength(raw_ostream &Out, const IdentifierInfo *II, IdentifierID ID) { // Record the location of the identifier data. This is used when generating // the mapping from persistent IDs to strings. Writer.SetIdentifierOffset(II, Out.tell()); @@ -3807,7 +3807,7 @@ class ASTIdentifierTableTrait { Out.write(II->getNameStart(), KeyLen); } - void EmitData(raw_ostream &Out, const IdentifierInfo *II, IdentID ID, + void EmitData(raw_ostream &Out, const IdentifierInfo *II, IdentifierID ID, unsigned) { using namespace llvm::support; @@ -3891,7 +3891,7 @@ void ASTWriter::WriteIdentifierTable(Preprocessor &PP, IdentifierOffsets.resize(NextIdentID - FirstIdentID); for (auto IdentIDPair : IdentifierIDs) { const IdentifierInfo *II = IdentIDPair.first; - IdentID ID = IdentIDPair.second; + IdentifierID ID = IdentIDPair.second; assert(II && "NULL identifier in identifier table"); // Write out identifiers if either the ID is local or the identifier has @@ -4779,7 +4779,7 @@ void ASTWriter::AddVersionTuple(const VersionTuple &Version, /// Note that the identifier II occurs at the given offset /// within the identifier table. void ASTWriter::SetIdentifierOffset(const IdentifierInfo *II, uint32_t Offset) { - IdentID ID = IdentifierIDs[II]; + IdentifierID ID = IdentifierIDs[II]; // Only store offsets new to this AST file. Other identifier names are looked // up earlier in the chain and thus don't need an offset. if (ID >= FirstIdentID) @@ -5945,11 +5945,11 @@ void ASTWriter::AddIdentifierRef(const IdentifierInfo *II, RecordDataImpl &Recor Record.push_back(getIdentifierRef(II)); } -IdentID ASTWriter::getIdentifierRef(const IdentifierInfo *II) { +IdentifierID ASTWriter::getIdentifierRef(const IdentifierInfo *II) { if (!II) return 0; - IdentID &ID = IdentifierIDs[II]; + IdentifierID &ID = IdentifierIDs[II]; if (ID == 0) ID = NextIdentID++; return ID; @@ -6610,9 +6610,9 @@ void ASTWriter::ReaderInitialized(ASTReader *Reader) { NextSubmoduleID = FirstSubmoduleID; } -void ASTWriter::IdentifierRead(IdentID ID, IdentifierInfo *II) { +void ASTWriter::IdentifierRead(IdentifierID ID, IdentifierInfo *II) { // Always keep the highest ID. See \p TypeRead() for more information. - IdentID &StoredID = IdentifierIDs[II]; + IdentifierID &StoredID = IdentifierIDs[II]; if (ID > StoredID) StoredID = ID; } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
