RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-20 02:58:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pull calcTypeName into TypePrinting class, make its type stack

Browse Source 
be a smallvector instead of vector.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@65713 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-02-28 20:34:19 +00:00
parent b1b9d91a39
commit b840cace77
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/VMCore/AsmWriter.cpp
View File

@ -147,6 +147,10 @@ namespace {
void print(const Type *Ty); void print(const Type *Ty);
void printAtLeastOneLevel(const Type *Ty); void printAtLeastOneLevel(const Type *Ty);
private:
void calcTypeName(const Type *Ty, SmallVectorImpl<const Type *> &TypeStack,
std::string &Result);
}; };
} // end anonymous namespace. } // end anonymous namespace.
@ -169,6 +173,7 @@ TypePrinting::TypePrinting(const Module *M, raw_ostream &os) : OS(os) {
continue; continue;
} }
// Get the name as a string and insert it into TypeNames.
std::string NameStr; std::string NameStr;
raw_string_ostream NameOS(NameStr); raw_string_ostream NameOS(NameStr);
PrintLLVMName(NameOS, TI->first.c_str(), TI->first.length(), LocalPrefix); PrintLLVMName(NameOS, TI->first.c_str(), TI->first.length(), LocalPrefix);
@ -176,9 +181,8 @@ TypePrinting::TypePrinting(const Module *M, raw_ostream &os) : OS(os) {
} }
} }
static void calcTypeName(const Type *Ty, void TypePrinting::calcTypeName(const Type *Ty,
std::vector<const Type *> &TypeStack, SmallVectorImpl<const Type *> &TypeStack,
std::map<const Type *, std::string> &TypeNames,
std::string &Result) { std::string &Result) {
if (Ty->isInteger() || (Ty->isPrimitiveType() && !isa<OpaqueType>(Ty))) { if (Ty->isInteger() || (Ty->isPrimitiveType() && !isa<OpaqueType>(Ty))) {
Result += Ty->getDescription(); // Base case Result += Ty->getDescription(); // Base case
@ -219,13 +223,13 @@ static void calcTypeName(const Type *Ty,
} }
case Type::FunctionTyID: { case Type::FunctionTyID: {
const FunctionType *FTy = cast<FunctionType>(Ty); const FunctionType *FTy = cast<FunctionType>(Ty);
calcTypeName(FTy->getReturnType(), TypeStack, TypeNames, Result); calcTypeName(FTy->getReturnType(), TypeStack, Result);
Result += " ("; Result += " (";
for (FunctionType::param_iterator I = FTy->param_begin(), for (FunctionType::param_iterator I = FTy->param_begin(),
E = FTy->param_end(); I != E; ++I) { E = FTy->param_end(); I != E; ++I) {
if (I != FTy->param_begin()) if (I != FTy->param_begin())
Result += ", "; Result += ", ";
calcTypeName(*I, TypeStack, TypeNames, Result); calcTypeName(*I, TypeStack, Result);
} }
if (FTy->isVarArg()) { if (FTy->isVarArg()) {
if (FTy->getNumParams()) Result += ", "; if (FTy->getNumParams()) Result += ", ";
@ -241,7 +245,7 @@ static void calcTypeName(const Type *Ty,
Result += "{ "; Result += "{ ";
for (StructType::element_iterator I = STy->element_begin(), for (StructType::element_iterator I = STy->element_begin(),
E = STy->element_end(); I != E; ++I) { E = STy->element_end(); I != E; ++I) {
calcTypeName(*I, TypeStack, TypeNames, Result); calcTypeName(*I, TypeStack, Result);
if (next(I) != STy->element_end()) if (next(I) != STy->element_end())
Result += ','; Result += ',';
Result += ' '; Result += ' ';
@ -253,7 +257,7 @@ static void calcTypeName(const Type *Ty,
} }
case Type::PointerTyID: { case Type::PointerTyID: {
const PointerType *PTy = cast<PointerType>(Ty); const PointerType *PTy = cast<PointerType>(Ty);
calcTypeName(PTy->getElementType(), TypeStack, TypeNames, Result); calcTypeName(PTy->getElementType(), TypeStack, Result);
if (unsigned AddressSpace = PTy->getAddressSpace()) if (unsigned AddressSpace = PTy->getAddressSpace())
Result += " addrspace(" + utostr(AddressSpace) + ")"; Result += " addrspace(" + utostr(AddressSpace) + ")";
Result += "*"; Result += "*";
@ -262,14 +266,14 @@ static void calcTypeName(const Type *Ty,
case Type::ArrayTyID: { case Type::ArrayTyID: {
const ArrayType *ATy = cast<ArrayType>(Ty); const ArrayType *ATy = cast<ArrayType>(Ty);
Result += "[" + utostr(ATy->getNumElements()) + " x "; Result += "[" + utostr(ATy->getNumElements()) + " x ";
calcTypeName(ATy->getElementType(), TypeStack, TypeNames, Result); calcTypeName(ATy->getElementType(), TypeStack, Result);
Result += "]"; Result += "]";
break; break;
} }
case Type::VectorTyID: { case Type::VectorTyID: {
const VectorType *PTy = cast<VectorType>(Ty); const VectorType *PTy = cast<VectorType>(Ty);
Result += "<" + utostr(PTy->getNumElements()) + " x "; Result += "<" + utostr(PTy->getNumElements()) + " x ";
calcTypeName(PTy->getElementType(), TypeStack, TypeNames, Result); calcTypeName(PTy->getElementType(), TypeStack, Result);
Result += ">"; Result += ">";
break; break;
} }
@ -305,9 +309,9 @@ void TypePrinting::print(const Type *Ty) {
// Otherwise we have a type that has not been named but is a derived type. // Otherwise we have a type that has not been named but is a derived type.
// Carefully recurse the type hierarchy to print out any contained symbolic // Carefully recurse the type hierarchy to print out any contained symbolic
// names. // names.
std::vector<const Type *> TypeStack; SmallVector<const Type *, 16> TypeStack;
std::string TypeName; std::string TypeName;
calcTypeName(Ty, TypeStack, TypeNames, TypeName); calcTypeName(Ty, TypeStack, TypeName);
TypeNames.insert(std::make_pair(Ty, TypeName));//Cache type name for later use TypeNames.insert(std::make_pair(Ty, TypeName));//Cache type name for later use
OS << TypeName; OS << TypeName;
} }