diff --git a/include/llvm/CodeGen/MachineDebugInfoDesc.h b/include/llvm/CodeGen/MachineDebugInfoDesc.h index 926733f6665..a79a12170dd 100644 --- a/include/llvm/CodeGen/MachineDebugInfoDesc.h +++ b/include/llvm/CodeGen/MachineDebugInfoDesc.h @@ -407,10 +407,10 @@ public: SubrangeDesc(); // Accessors - int64_t getLo() const { return Lo; } - int64_t getHi() const { return Hi; } - void setLo(int64_t L) { Lo = L; } - void setHi(int64_t H) { Hi = H; } + int64_t getLo() const { return Lo; } + int64_t getHi() const { return Hi; } + void setLo(int64_t L) { Lo = L; } + void setHi(int64_t H) { Hi = H; } /// ApplyToFields - Target the visitor to the fields of the SubrangeDesc. /// @@ -552,34 +552,32 @@ protected: explicit GlobalDesc(unsigned T); public: // Accessors - DebugInfoDesc *getContext() const { return Context; } - const std::string &getName() const { return Name; } - const std::string &getFullName() const { return FullName; } - const std::string &getLinkageName() const { return LinkageName; } + DebugInfoDesc *getContext() const { return Context; } + const std::string &getName() const { return Name; } + const std::string &getFullName() const { return FullName; } + const std::string &getLinkageName() const { return LinkageName; } CompileUnitDesc *getFile() const { return static_cast(File); } - unsigned getLine() const { return Line; } + unsigned getLine() const { return Line; } TypeDesc *getType() const { return static_cast(TyDesc); } - - bool isStatic() const { return IsStatic; } - bool isDefinition() const { return IsDefinition; } - - void setContext(DebugInfoDesc *C) { Context = C; } - void setName(const std::string &N) { Name = N; } - void setFullName(const std::string &N) { FullName = N; } - void setLinkageName(const std::string &N) { LinkageName = N; } + bool isStatic() const { return IsStatic; } + bool isDefinition() const { return IsDefinition; } + void setContext(DebugInfoDesc *C) { Context = C; } + void setName(const std::string &N) { Name = N; } + void setFullName(const std::string &N) { FullName = N; } + void setLinkageName(const std::string &N) { LinkageName = N; } void setFile(CompileUnitDesc *U) { File = static_cast(U); } - void setLine(unsigned L) { Line = L; } + void setLine(unsigned L) { Line = L; } void setType(TypeDesc *T) { TyDesc = static_cast(T); } - void setIsStatic(bool IS) { IsStatic = IS; } - void setIsDefinition(bool ID) { IsDefinition = ID; } + void setIsStatic(bool IS) { IsStatic = IS; } + void setIsDefinition(bool ID) { IsDefinition = ID; } /// ApplyToFields - Target the visitor to the fields of the GlobalDesc. /// @@ -595,8 +593,8 @@ public: GlobalVariableDesc(); // Accessors. - GlobalVariable *getGlobalVariable() const { return Global; } - void setGlobalVariable(GlobalVariable *GV) { Global = GV; } + GlobalVariable *getGlobalVariable() const { return Global; } + void setGlobalVariable(GlobalVariable *GV) { Global = GV; } /// ApplyToFields - Target the visitor to the fields of the /// GlobalVariableDesc. @@ -675,8 +673,8 @@ public: BlockDesc(); // Accessors - DebugInfoDesc *getContext() const { return Context; } - void setContext(DebugInfoDesc *C) { Context = C; } + DebugInfoDesc *getContext() const { return Context; } + void setContext(DebugInfoDesc *C) { Context = C; } /// ApplyToFields - Target the visitor to the fields of the BlockDesc. /// diff --git a/include/llvm/CodeGen/MachineModuleInfo.h b/include/llvm/CodeGen/MachineModuleInfo.h index 748dfd68ced..f2a2b7b674c 100644 --- a/include/llvm/CodeGen/MachineModuleInfo.h +++ b/include/llvm/CodeGen/MachineModuleInfo.h @@ -33,6 +33,7 @@ #include "llvm/GlobalValue.h" #include "llvm/Pass.h" +#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/UniqueVector.h" @@ -85,15 +86,10 @@ public: /// DIDeserializer - This class is responsible for casting GlobalVariables /// into DebugInfoDesc objects. class DIDeserializer { -private: - std::map GlobalDescs; - // Previously defined gloabls. - + // Previously defined gloabls. + DenseMap GlobalDescs; public: - DIDeserializer() {} - ~DIDeserializer() {} - - const std::map &getGlobalDescs() const { + const DenseMap &getGlobalDescs() const { return GlobalDescs; } @@ -107,27 +103,23 @@ public: /// DISerializer - This class is responsible for casting DebugInfoDesc objects /// into GlobalVariables. class DISerializer { -private: Module *M; // Definition space module. PointerType *StrPtrTy; // A "i8*" type. Created lazily. PointerType *EmptyStructPtrTy; // A "{ }*" type. Created lazily. + + // Types per Tag. Created lazily. std::map TagTypes; - // Types per Tag. Created lazily. - std::map DescGlobals; - // Previously defined descriptors. - std::map StringCache; - // Previously defined strings. - + + // Previously defined descriptors. + DenseMap DescGlobals; + + // Previously defined strings. + DenseMap StringCache; public: DISerializer() - : M(NULL) - , StrPtrTy(NULL) - , EmptyStructPtrTy(NULL) - , TagTypes() - , DescGlobals() - , StringCache() + : M(NULL), StrPtrTy(NULL), EmptyStructPtrTy(NULL), TagTypes(), + DescGlobals(), StringCache() {} - ~DISerializer() {} // Accessors Module *getModule() const { return M; }; @@ -161,21 +153,17 @@ public: /// DIVerifier - This class is responsible for verifying the given network of /// GlobalVariables are valid as DebugInfoDesc objects. class DIVerifier { -private: enum { Unknown = 0, Invalid, Valid }; - std::map Validity;// Tracks prior results. - std::map Counts; // Count of fields per Tag type. - + DenseMap Validity; // Tracks prior results. + std::map Counts; // Count of fields per Tag type. public: DIVerifier() - : Validity() - , Counts() + : Validity(), Counts() {} - ~DIVerifier() {} /// Verify - Return true if the GlobalVariable appears to be a valid /// serialization of a DebugInfoDesc. @@ -191,12 +179,10 @@ public: /// SourceLineInfo - This class is used to record source line correspondence. /// class SourceLineInfo { -private: unsigned Line; // Source line number. unsigned Column; // Source column. unsigned SourceID; // Source ID number. unsigned LabelID; // Label in code ID number. - public: SourceLineInfo(unsigned L, unsigned C, unsigned S, unsigned I) : Line(L), Column(C), SourceID(S), LabelID(I) {} @@ -212,10 +198,8 @@ public: /// SourceFileInfo - This class is used to track source information. /// class SourceFileInfo { -private: unsigned DirectoryID; // Directory ID number. std::string Name; // File name (not including directory.) - public: SourceFileInfo(unsigned D, const std::string &N) : DirectoryID(D), Name(N) {} @@ -591,7 +575,7 @@ public: /// getFilterIDFor - Return the id of the filter encoded by TyIds. This is /// function wide. - int getFilterIDFor(SmallVectorImpl &TyIds); + int getFilterIDFor(std::vector &TyIds); /// TidyLandingPads - Remap landing pad labels and remove any deleted landing /// pads. diff --git a/lib/CodeGen/MachineModuleInfo.cpp b/lib/CodeGen/MachineModuleInfo.cpp index 8aba86ed8ea..ae3632ac285 100644 --- a/lib/CodeGen/MachineModuleInfo.cpp +++ b/lib/CodeGen/MachineModuleInfo.cpp @@ -38,7 +38,7 @@ char MachineModuleInfo::ID = 0; /// getGlobalVariablesUsing - Return all of the GlobalVariables which have the /// specified value in their initializer somewhere. static void -getGlobalVariablesUsing(Value *V, std::vector &Result) { +getGlobalVariablesUsing(Value *V, SmallVectorImpl &Result) { // Scan though value users. for (Value::use_iterator I = V->use_begin(), E = V->use_end(); I != E; ++I) { if (GlobalVariable *GV = dyn_cast(*I)) { @@ -55,7 +55,7 @@ getGlobalVariablesUsing(Value *V, std::vector &Result) { /// named GlobalVariable. static void getGlobalVariablesUsing(Module &M, const std::string &RootName, - std::vector &Result) { + SmallVectorImpl &Result) { std::vector FieldTypes; FieldTypes.push_back(Type::Int32Ty); FieldTypes.push_back(Type::Int32Ty); @@ -180,10 +180,7 @@ private: public: DIDeserializeVisitor(DIDeserializer &D, GlobalVariable *GV) - : DIVisitor() - , DR(D) - , I(0) - , CI(cast(GV->getInitializer())) + : DIVisitor(), DR(D), I(0), CI(cast(GV->getInitializer())) {} /// Apply - Set the value of each of the fields. @@ -276,7 +273,7 @@ public: Elements.push_back(ConstantInt::get(Type::Int1Ty, Field)); } virtual void Apply(std::string &Field) { - Elements.push_back(SR.getString(Field)); + Elements.push_back(SR.getString(Field)); } virtual void Apply(DebugInfoDesc *&Field) { GlobalVariable *GV = NULL; @@ -511,14 +508,11 @@ const PointerType *DISerializer::getStrPtrType() { /// const PointerType *DISerializer::getEmptyStructPtrType() { // If not already defined. - if (!EmptyStructPtrTy) { - // Construct the empty structure type. - const StructType *EmptyStructTy = StructType::get(NULL, NULL); + if (EmptyStructPtrTy) return EmptyStructPtrTy; - // Construct the pointer to empty structure type. - EmptyStructPtrTy = PointerType::getUnqual(EmptyStructTy); - } - + // Construct the pointer to empty structure type. + const StructType *EmptyStructTy = + StructType::get(std::vector()); return EmptyStructPtrTy; } @@ -532,7 +526,6 @@ const StructType *DISerializer::getTagType(DebugInfoDesc *DD) { if (!Ty) { // Set up fields vector. std::vector Fields; - // Get types of fields. DIGetTypesVisitor GTAM(*this, Fields); GTAM.ApplyToFields(DD); @@ -551,7 +544,7 @@ const StructType *DISerializer::getTagType(DebugInfoDesc *DD) { /// Constant *DISerializer::getString(const std::string &String) { // Check string cache for previous edition. - Constant *&Slot = StringCache[String]; + Constant *&Slot = StringCache[String.c_str()]; // Return Constant if previously defined. if (Slot) return Slot; @@ -599,7 +592,6 @@ GlobalVariable *DISerializer::Serialize(DebugInfoDesc *DD) { // Set up elements vector std::vector Elements; - // Add fields. DISerializeVisitor SRAM(*this, Elements); SRAM.ApplyToFields(DD); @@ -839,7 +831,7 @@ const UniqueVector MachineModuleInfo::getCompileUnits()const{ void MachineModuleInfo::getAnchoredDescriptors(Module &M, const AnchoredDesc *Desc, std::vector &AnchoredDescs) { - std::vector Globals; + SmallVector Globals; getGlobalVariablesUsing(M, Desc->getAnchorString(), Globals); for (unsigned i = 0, N = Globals.size(); i < N; ++i) { @@ -1003,11 +995,9 @@ void MachineModuleInfo::addCatchTypeInfo(MachineBasicBlock *LandingPad, void MachineModuleInfo::addFilterTypeInfo(MachineBasicBlock *LandingPad, std::vector &TyInfo) { LandingPadInfo &LP = getOrCreateLandingPadInfo(LandingPad); - SmallVector IdsInFilter(TyInfo.size()); - + std::vector IdsInFilter (TyInfo.size()); for (unsigned I = 0, E = TyInfo.size(); I != E; ++I) IdsInFilter[I] = getTypeIDFor(TyInfo[I]); - LP.TypeIds.push_back(getFilterIDFor(IdsInFilter)); } @@ -1075,14 +1065,13 @@ unsigned MachineModuleInfo::getTypeIDFor(GlobalVariable *TI) { /// getFilterIDFor - Return the filter id for the specified typeinfos. This is /// function wide. -int MachineModuleInfo::getFilterIDFor(SmallVectorImpl &TyIds) { +int MachineModuleInfo::getFilterIDFor(std::vector &TyIds) { // If the new filter coincides with the tail of an existing filter, then // re-use the existing filter. Folding filters more than this requires // re-ordering filters and/or their elements - probably not worth it. - unsigned TyIDSize = TyIds.size(); for (std::vector::iterator I = FilterEnds.begin(), E = FilterEnds.end(); I != E; ++I) { - unsigned i = *I, j = TyIDSize; + unsigned i = *I, j = TyIds.size(); while (i && j) if (FilterIds[--i] != TyIds[--j]) @@ -1091,18 +1080,16 @@ int MachineModuleInfo::getFilterIDFor(SmallVectorImpl &TyIds) { if (!j) // The new filter coincides with range [i, end) of the existing filter. return -(1 + i); + try_next:; } // Add the new filter. - unsigned FilterIDSize = FilterIds.size(); - int FilterID = -(1 + FilterIDSize); - FilterIds.reserve(FilterIDSize + TyIDSize + 1); - - for (unsigned I = 0, N = TyIDSize; I != N; ++I) + int FilterID = -(1 + FilterIds.size()); + FilterIds.reserve(FilterIds.size() + TyIds.size() + 1); + for (unsigned I = 0, N = TyIds.size(); I != N; ++I) FilterIds.push_back(TyIds[I]); - - FilterEnds.push_back(FilterIDSize); + FilterEnds.push_back(FilterIds.size()); FilterIds.push_back(0); // terminator return FilterID; } @@ -1120,13 +1107,13 @@ unsigned MachineModuleInfo::getPersonalityIndex() const { const Function* Personality = NULL; // Scan landing pads. If there is at least one non-NULL personality - use it. - for (unsigned i = 0, e = LandingPads.size(); i != e; ++i) + for (unsigned i = 0; i != LandingPads.size(); ++i) if (LandingPads[i].Personality) { Personality = LandingPads[i].Personality; break; } - for (unsigned i = 0, e = Personalities.size(); i < e; ++i) { + for (unsigned i = 0; i < Personalities.size(); ++i) { if (Personalities[i] == Personality) return i; }