Print the names of more opaque types

llvm-svn: 9598
This commit is contained in:
Chris Lattner 2003-10-30 00:22:33 +00:00
parent 92d60539c8
commit f14ead9210
1 changed files with 7 additions and 5 deletions

View File

@ -111,7 +111,8 @@ static void fillTypeNameTable(const Module *M,
//
const Type *Ty = cast<Type>(I->second);
if (!isa<PointerType>(Ty) ||
!cast<PointerType>(Ty)->getElementType()->isPrimitiveType())
!cast<PointerType>(Ty)->getElementType()->isPrimitiveType() ||
isa<OpaqueType>(cast<PointerType>(Ty)->getElementType()))
TypeNames.insert(std::make_pair(Ty, getLLVMName(I->first)));
}
}
@ -122,12 +123,16 @@ static void fillTypeNameTable(const Module *M,
static std::string calcTypeName(const Type *Ty,
std::vector<const Type *> &TypeStack,
std::map<const Type *, std::string> &TypeNames){
if (Ty->isPrimitiveType()) return Ty->getDescription(); // Base case
if (Ty->isPrimitiveType() && !isa<OpaqueType>(Ty))
return Ty->getDescription(); // Base case
// Check to see if the type is named.
std::map<const Type *, std::string>::iterator I = TypeNames.find(Ty);
if (I != TypeNames.end()) return I->second;
if (isa<OpaqueType>(Ty))
return "opaque";
// Check to see if the Type is already on the stack...
unsigned Slot = 0, CurSize = TypeStack.size();
while (Slot < CurSize && TypeStack[Slot] != Ty) ++Slot; // Scan for type
@ -210,9 +215,6 @@ static std::ostream &printTypeInt(std::ostream &Out, const Type *Ty,
std::map<const Type *, std::string>::iterator I = TypeNames.find(Ty);
if (I != TypeNames.end()) return Out << I->second;
if (isa<OpaqueType>(Ty))
return Out << "opaque";
// 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
// names.