[llvm-commits] [llvm] r52803 - 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 17:56:36 PDT 2008
Author: void
Date: Thu Jun 26 19:56:36 2008
New Revision: 52803
URL: http://llvm.org/viewvc/llvm-project?rev=52803&view=rev
Log:
- Remove a use of std::vector.
- Make sure that we're not recalculating the size of a vector
that never changes.
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=52803&r1=52802&r2=52803&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h Thu Jun 26 19:56:36 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,32 +552,34 @@
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.
///
@@ -593,8 +595,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.
@@ -673,8 +675,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=52803&r1=52802&r2=52803&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h Thu Jun 26 19:56:36 2008
@@ -591,7 +591,7 @@
/// getFilterIDFor - Return the id of the filter encoded by TyIds. This is
/// function wide.
- int getFilterIDFor(std::vector<unsigned> &TyIds);
+ int getFilterIDFor(SmallVectorImpl<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=52803&r1=52802&r2=52803&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp Thu Jun 26 19:56:36 2008
@@ -513,8 +513,8 @@
// If not already defined.
if (!EmptyStructPtrTy) {
// Construct the empty structure type.
- const StructType *EmptyStructTy =
- StructType::get(std::vector<const Type*>());
+ const StructType *EmptyStructTy = StructType::get(NULL, NULL);
+
// Construct the pointer to empty structure type.
EmptyStructPtrTy = PointerType::getUnqual(EmptyStructTy);
}
@@ -532,6 +532,7 @@
if (!Ty) {
// Set up fields vector.
std::vector<const Type*> Fields;
+
// Get types of fields.
DIGetTypesVisitor GTAM(*this, Fields);
GTAM.ApplyToFields(DD);
@@ -551,22 +552,27 @@
Constant *DISerializer::getString(const std::string &String) {
// Check string cache for previous edition.
Constant *&Slot = StringCache[String];
+
// Return Constant if previously defined.
if (Slot) return Slot;
+
// If empty string then use a sbyte* null instead.
if (String.empty()) {
Slot = ConstantPointerNull::get(getStrPtrType());
} else {
// Construct string as an llvm constant.
Constant *ConstStr = ConstantArray::get(String);
+
// Otherwise create and return a new string global.
GlobalVariable *StrGV = new GlobalVariable(ConstStr->getType(), true,
GlobalVariable::InternalLinkage,
ConstStr, ".str", M);
StrGV->setSection("llvm.metadata");
+
// Convert to generic string pointer.
Slot = ConstantExpr::getBitCast(StrGV, getStrPtrType());
}
+
return Slot;
}
@@ -593,6 +599,7 @@
// Set up elements vector
std::vector<Constant*> Elements;
+
// Add fields.
DISerializeVisitor SRAM(*this, Elements);
SRAM.ApplyToFields(DD);
@@ -996,9 +1003,11 @@
void MachineModuleInfo::addFilterTypeInfo(MachineBasicBlock *LandingPad,
std::vector<GlobalVariable *> &TyInfo) {
LandingPadInfo &LP = getOrCreateLandingPadInfo(LandingPad);
- std::vector<unsigned> IdsInFilter (TyInfo.size());
+ SmallVector<unsigned, 32> IdsInFilter(TyInfo.size());
+
for (unsigned I = 0, E = TyInfo.size(); I != E; ++I)
IdsInFilter[I] = getTypeIDFor(TyInfo[I]);
+
LP.TypeIds.push_back(getFilterIDFor(IdsInFilter));
}
@@ -1066,13 +1075,14 @@
/// getFilterIDFor - Return the filter id for the specified typeinfos. This is
/// function wide.
-int MachineModuleInfo::getFilterIDFor(std::vector<unsigned> &TyIds) {
+int MachineModuleInfo::getFilterIDFor(SmallVectorImpl<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 = TyIds.size();
+ unsigned i = *I, j = TyIDSize;
while (i && j)
if (FilterIds[--i] != TyIds[--j])
@@ -1081,16 +1091,18 @@
if (!j)
// The new filter coincides with range [i, end) of the existing filter.
return -(1 + i);
-
try_next:;
}
// Add the new filter.
- int FilterID = -(1 + FilterIds.size());
- FilterIds.reserve(FilterIds.size() + TyIds.size() + 1);
- for (unsigned I = 0, N = TyIds.size(); I != N; ++I)
+ unsigned FilterIDSize = FilterIds.size();
+ int FilterID = -(1 + FilterIDSize);
+ FilterIds.reserve(FilterIDSize + TyIDSize + 1);
+
+ for (unsigned I = 0, N = TyIDSize; I != N; ++I)
FilterIds.push_back(TyIds[I]);
- FilterEnds.push_back(FilterIds.size());
+
+ FilterEnds.push_back(FilterIDSize);
FilterIds.push_back(0); // terminator
return FilterID;
}
@@ -1108,13 +1120,13 @@
const Function* Personality = NULL;
// Scan landing pads. If there is at least one non-NULL personality - use it.
- for (unsigned i = 0; i != LandingPads.size(); ++i)
+ for (unsigned i = 0, e = LandingPads.size(); i != e; ++i)
if (LandingPads[i].Personality) {
Personality = LandingPads[i].Personality;
break;
}
- for (unsigned i = 0; i < Personalities.size(); ++i) {
+ for (unsigned i = 0, e = Personalities.size(); i < e; ++i) {
if (Personalities[i] == Personality)
return i;
}
More information about the llvm-commits
mailing list