diff options
| -rw-r--r-- | lib/CodeGen/CGDebugInfo.cpp | 20 | ||||
| -rw-r--r-- | lib/CodeGen/CGDebugInfo.h | 2 | ||||
| -rw-r--r-- | test/CodeGenObjC/debug-info.m | 8 |
3 files changed, 25 insertions, 5 deletions
diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index 3d7417df30..0344f562a7 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -200,6 +200,19 @@ llvm::DIType CGDebugInfo::CreateCVRType(QualType Ty, llvm::DICompileUnit Unit) { 0, 0, 0, 0, 0, FromTy); } +llvm::DIType CGDebugInfo::CreateType(const ObjCObjectPointerType *Ty, + llvm::DICompileUnit Unit) { + llvm::DIType EltTy = getOrCreateType(Ty->getPointeeType(), Unit); + + // Bit size, align and offset of the type. + uint64_t Size = M->getContext().getTypeSize(Ty); + uint64_t Align = M->getContext().getTypeAlign(Ty); + + return DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_pointer_type, Unit, + "", llvm::DICompileUnit(), + 0, Size, Align, 0, 0, EltTy); +} + llvm::DIType CGDebugInfo::CreateType(const PointerType *Ty, llvm::DICompileUnit Unit) { llvm::DIType EltTy = getOrCreateType(Ty->getPointeeType(), Unit); @@ -764,11 +777,8 @@ llvm::DIType CGDebugInfo::getOrCreateType(QualType Ty, case Type::QualifiedName: // Unsupported types return llvm::DIType(); - case Type::ObjCObjectPointer: // Encode id<p> in debug info just like id. - { - ObjCObjectPointerType *OPT = cast<ObjCObjectPointerType>(Ty); - return Slot = CreateType(OPT->getInterfaceType(), Unit); - } + case Type::ObjCObjectPointer: + return Slot = CreateType(cast<ObjCObjectPointerType>(Ty), Unit); case Type::ObjCQualifiedInterface: // Drop protocols from interface. case Type::ObjCInterface: return Slot = CreateType(cast<ObjCInterfaceType>(Ty), Unit); diff --git a/lib/CodeGen/CGDebugInfo.h b/lib/CodeGen/CGDebugInfo.h index de655800fa..ac28e5b879 100644 --- a/lib/CodeGen/CGDebugInfo.h +++ b/lib/CodeGen/CGDebugInfo.h @@ -56,6 +56,8 @@ class CGDebugInfo { llvm::DIType CreateType(const ComplexType *Ty, llvm::DICompileUnit U); llvm::DIType CreateCVRType(QualType Ty, llvm::DICompileUnit U); llvm::DIType CreateType(const TypedefType *Ty, llvm::DICompileUnit U); + llvm::DIType CreateType(const ObjCObjectPointerType *Ty, + llvm::DICompileUnit Unit); llvm::DIType CreateType(const PointerType *Ty, llvm::DICompileUnit U); llvm::DIType CreateType(const BlockPointerType *Ty, llvm::DICompileUnit U); llvm::DIType CreateType(const FunctionType *Ty, llvm::DICompileUnit U); diff --git a/test/CodeGenObjC/debug-info.m b/test/CodeGenObjC/debug-info.m index 9c461ba68f..519706be79 100644 --- a/test/CodeGenObjC/debug-info.m +++ b/test/CodeGenObjC/debug-info.m @@ -16,3 +16,11 @@ @implementation A // Line 15 -(void) m0 {} @end + +@interface I1 { + I1 *iv0; +} +@end +void f0(void) { + I1 *x; +} |