[llvm-commits] [llvm] r52806 - in /llvm/trunk: include/llvm/CodeGen/MachineDebugInfoDesc.h include/llvm/CodeGen/MachineModuleInfo.h lib/CodeGen/MachineModuleInfo.cpp
Bill Wendling
isanbard at gmail.com
Thu Jun 26 18:27:57 PDT 2008
Author: void
Date: Thu Jun 26 20:27:56 2008
New Revision: 52806
URL: http://llvm.org/viewvc/llvm-project?rev=52806&view=rev
Log:
Reverting broken patch r52803.
Modified:
llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h
llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h
llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp
Modified: llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h?rev=52806&r1=52805&r2=52806&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h Thu Jun 26 20:27:56 2008
@@ -407,10 +407,10 @@
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 @@
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<CompileUnitDesc *>(File);
}
- unsigned getLine() const { return Line; }
+ unsigned getLine() const { return Line; }
TypeDesc *getType() const {
return static_cast<TypeDesc *>(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<DebugInfoDesc *>(U);
}
- void setLine(unsigned L) { Line = L; }
+ void setLine(unsigned L) { Line = L; }
void setType(TypeDesc *T) {
TyDesc = static_cast<DebugInfoDesc *>(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 @@
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 @@
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.
///
Modified: llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h?rev=52806&r1=52805&r2=52806&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h Thu Jun 26 20:27:56 2008
@@ -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 @@
/// DIDeserializer - This class is responsible for casting GlobalVariables
/// into DebugInfoDesc objects.
class DIDeserializer {
-private:
- std::map<GlobalVariable *, DebugInfoDesc *> GlobalDescs;
- // Previously defined gloabls.
-
+ // Previously defined gloabls.
+ DenseMap<GlobalVariable*, DebugInfoDesc*> GlobalDescs;
public:
- DIDeserializer() {}
- ~DIDeserializer() {}
-
- const std::map<GlobalVariable *, DebugInfoDesc *> &getGlobalDescs() const {
+ const DenseMap<GlobalVariable *, DebugInfoDesc *> &getGlobalDescs() const {
return GlobalDescs;
}
@@ -107,27 +103,23 @@
/// 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<unsigned, StructType *> TagTypes;
- // Types per Tag. Created lazily.
- std::map<DebugInfoDesc *, GlobalVariable *> DescGlobals;
- // Previously defined descriptors.
- std::map<const std::string, Constant *> StringCache;
- // Previously defined strings.
-
+
+ // Previously defined descriptors.
+ DenseMap<DebugInfoDesc *, GlobalVariable *> DescGlobals;
+
+ // Previously defined strings.
+ DenseMap<const char *, Constant*> 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 @@
/// 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<GlobalVariable *, unsigned> Validity;// Tracks prior results.
- std::map<unsigned, unsigned> Counts; // Count of fields per Tag type.
-
+ DenseMap<GlobalVariable *, unsigned> Validity; // Tracks prior results.
+ std::map<unsigned, unsigned> 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 @@
/// 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 @@
/// 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 @@
/// getFilterIDFor - Return the id of the filter encoded by TyIds. This is
/// function wide.
- int getFilterIDFor(SmallVectorImpl<unsigned> &TyIds);
+ int getFilterIDFor(std::vector<unsigned> &TyIds);
/// TidyLandingPads - Remap landing pad labels and remove any deleted landing
/// pads.
Modified: llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp?rev=52806&r1=52805&r2=52806&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp Thu Jun 26 20:27:56 2008
@@ -38,7 +38,7 @@
/// getGlobalVariablesUsing - Return all of the GlobalVariables which have the
/// specified value in their initializer somewhere.
static void
-getGlobalVariablesUsing(Value *V, std::vector<GlobalVariable*> &Result) {
+getGlobalVariablesUsing(Value *V, SmallVectorImpl<GlobalVariable*> &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<GlobalVariable>(*I)) {
@@ -55,7 +55,7 @@
/// named GlobalVariable.
static void
getGlobalVariablesUsing(Module &M, const std::string &RootName,
- std::vector<GlobalVariable*> &Result) {
+ SmallVectorImpl<GlobalVariable*> &Result) {
std::vector<const Type*> FieldTypes;
FieldTypes.push_back(Type::Int32Ty);
FieldTypes.push_back(Type::Int32Ty);
@@ -180,10 +180,7 @@
public:
DIDeserializeVisitor(DIDeserializer &D, GlobalVariable *GV)
- : DIVisitor()
- , DR(D)
- , I(0)
- , CI(cast<ConstantStruct>(GV->getInitializer()))
+ : DIVisitor(), DR(D), I(0), CI(cast<ConstantStruct>(GV->getInitializer()))
{}
/// Apply - Set the value of each of the fields.
@@ -276,7 +273,7 @@
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::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<const Type*>());
return EmptyStructPtrTy;
}
@@ -532,7 +526,6 @@
if (!Ty) {
// Set up fields vector.
std::vector<const Type*> Fields;
-
// Get types of fields.
DIGetTypesVisitor GTAM(*this, Fields);
GTAM.ApplyToFields(DD);
@@ -551,7 +544,7 @@
///
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 @@
// Set up elements vector
std::vector<Constant*> Elements;
-
// Add fields.
DISerializeVisitor SRAM(*this, Elements);
SRAM.ApplyToFields(DD);
@@ -839,7 +831,7 @@
void
MachineModuleInfo::getAnchoredDescriptors(Module &M, const AnchoredDesc *Desc,
std::vector<void*> &AnchoredDescs) {
- std::vector<GlobalVariable*> Globals;
+ SmallVector<GlobalVariable*, 64> Globals;
getGlobalVariablesUsing(M, Desc->getAnchorString(), Globals);
for (unsigned i = 0, N = Globals.size(); i < N; ++i) {
@@ -1003,11 +995,9 @@
void MachineModuleInfo::addFilterTypeInfo(MachineBasicBlock *LandingPad,
std::vector<GlobalVariable *> &TyInfo) {
LandingPadInfo &LP = getOrCreateLandingPadInfo(LandingPad);
- SmallVector<unsigned, 32> IdsInFilter(TyInfo.size());
-
+ std::vector<unsigned> 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 @@
/// getFilterIDFor - Return the filter id for the specified typeinfos. This is
/// function wide.
-int MachineModuleInfo::getFilterIDFor(SmallVectorImpl<unsigned> &TyIds) {
+int MachineModuleInfo::getFilterIDFor(std::vector<unsigned> &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<unsigned>::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 @@
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 @@
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;
}
More information about the llvm-commits
mailing list