DebugInfo: Rename CreatePointerType to getOrCreateTypeDeclaration

To make this more consistent with 'getOrCreateType' & clarify the
distinction between the two. The only thing I couldn't quite communicate
in the name is that getOrCreateTypeDeclaration may actually produce a
full definition (in -fno-limit-debug-info) but the point is to call it
whenever only a declaration is needed & the implementation can choose
whether to provide a declaration or definition.

(also, unfortunately, getOrCreateType can produce declarations too - we
should sure this up by making it not do that - any caller that can
tolerate a declaration should be calling getOrCreateTypeDeclaration
instead)

llvm-svn: 182674
This commit is contained in:
David Blaikie 2013-05-24 21:33:22 +00:00
parent 22c460a051
commit 4583bea0b2
2 changed files with 12 additions and 10 deletions

View File

@ -607,10 +607,10 @@ llvm::DIDescriptor CGDebugInfo::createContextChain(const Decl *Context) {
return TheCU;
}
/// CreatePointeeType - Create Pointee type. If Pointee is a record
/// getOrCreateTypeDeclaration - Create Pointee type. If Pointee is a record
/// then emit record's fwd if debug info size reduction is enabled.
llvm::DIType CGDebugInfo::CreatePointeeType(QualType PointeeTy,
llvm::DIFile Unit) {
llvm::DIType CGDebugInfo::getOrCreateTypeDeclaration(QualType PointeeTy,
llvm::DIFile Unit) {
if (DebugKind > CodeGenOptions::LimitedDebugInfo)
return getOrCreateType(PointeeTy, Unit);
@ -642,8 +642,8 @@ llvm::DIType CGDebugInfo::CreatePointerLikeType(unsigned Tag,
llvm::DIFile Unit) {
if (Tag == llvm::dwarf::DW_TAG_reference_type ||
Tag == llvm::dwarf::DW_TAG_rvalue_reference_type)
return DBuilder.createReferenceType(Tag,
CreatePointeeType(PointeeTy, Unit));
return DBuilder.createReferenceType(
Tag, getOrCreateTypeDeclaration(PointeeTy, Unit));
// Bit size, align and offset of the type.
// Size is always the size of a pointer. We can't use getTypeSize here
@ -652,7 +652,7 @@ llvm::DIType CGDebugInfo::CreatePointerLikeType(unsigned Tag,
uint64_t Size = CGM.getTarget().getPointerWidth(AS);
uint64_t Align = CGM.getContext().getTypeAlign(Ty);
return DBuilder.createPointerType(CreatePointeeType(PointeeTy, Unit),
return DBuilder.createPointerType(getOrCreateTypeDeclaration(PointeeTy, Unit),
Size, Align);
}
@ -733,7 +733,8 @@ llvm::DIType CGDebugInfo::CreateType(const BlockPointerType *Ty,
llvm::DIType CGDebugInfo::CreateType(const TypedefType *Ty, llvm::DIFile Unit) {
// Typedefs are derived from some other type. If we have a typedef of a
// typedef, make sure to emit the whole chain.
llvm::DIType Src = CreatePointeeType(Ty->getDecl()->getUnderlyingType(), Unit);
llvm::DIType Src =
getOrCreateTypeDeclaration(Ty->getDecl()->getUnderlyingType(), Unit);
if (!Src.Verify())
return llvm::DIType();
// We don't set size information, but do specify where the typedef was
@ -1727,7 +1728,7 @@ llvm::DIType CGDebugInfo::CreateType(const MemberPointerType *Ty,
llvm::DIType ClassType = getOrCreateType(QualType(Ty->getClass(), 0), U);
if (!Ty->getPointeeType()->isFunctionType())
return DBuilder.createMemberPointerType(
CreatePointeeType(Ty->getPointeeType(), U), ClassType);
getOrCreateTypeDeclaration(Ty->getPointeeType(), U), ClassType);
return DBuilder.createMemberPointerType(getOrCreateInstanceMethodType(
CGM.getContext().getPointerType(
QualType(Ty->getClass(), Ty->getPointeeType().getCVRQualifiers())),
@ -2198,7 +2199,8 @@ llvm::DIDescriptor CGDebugInfo::getDeclarationOrDefinition(const Decl *D) {
// in unlimited debug info)
if (const TypeDecl *TD = dyn_cast<TypeDecl>(D)) {
llvm::DIFile DefUnit = getOrCreateFile(TD->getLocation());
return CreatePointeeType(CGM.getContext().getTypeDeclType(TD), DefUnit);
return getOrCreateTypeDeclaration(CGM.getContext().getTypeDeclType(TD),
DefUnit);
}
// Otherwise fall back to a fairly rudimentary cache of existing declarations.
// This doesn't handle providing declarations (for functions or variables) for

View File

@ -137,7 +137,7 @@ class CGDebugInfo {
llvm::DIFile F);
llvm::DIType getOrCreateVTablePtrType(llvm::DIFile F);
llvm::DINameSpace getOrCreateNameSpace(const NamespaceDecl *N);
llvm::DIType CreatePointeeType(QualType PointeeTy, llvm::DIFile F);
llvm::DIType getOrCreateTypeDeclaration(QualType PointeeTy, llvm::DIFile F);
llvm::DIType CreatePointerLikeType(unsigned Tag,
const Type *Ty, QualType PointeeTy,
llvm::DIFile F);