diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/DwarfWriter.cpp | 35 | ||||
| -rw-r--r-- | lib/CodeGen/MachineDebugInfo.cpp | 34 |
2 files changed, 55 insertions, 14 deletions
diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp index 2ead4ce5af..9512f54873 100644 --- a/lib/CodeGen/DwarfWriter.cpp +++ b/lib/CodeGen/DwarfWriter.cpp @@ -1244,23 +1244,34 @@ DIE *DwarfWriter::NewType(DIE *Unit, TypeDesc *TyDesc) { // FIXME - handle larger sizes. unsigned Size = TyDesc->getSize() >> 3; - // Determine how to handle. - if (BasicTypeDesc *BasicTyDesc = dyn_cast<BasicTypeDesc>(TyDesc)) { - unsigned Encoding = BasicTyDesc->getEncoding(); + DIE *Ty = NULL; - DIE *Ty = new DIE(DW_TAG_base_type); - if (!Name.empty()) Ty->AddString(DW_AT_name, DW_FORM_string, Name); - - Ty->AddUInt (DW_AT_byte_size, 0, Size); - Ty->AddUInt (DW_AT_encoding, DW_FORM_data1, Encoding); + // Determine how to handle. + if (BasicTypeDesc *BasicTy = dyn_cast<BasicTypeDesc>(TyDesc)) { + Slot = Ty = new DIE(DW_TAG_base_type); + unsigned Encoding = BasicTy->getEncoding(); + Ty->AddUInt (DW_AT_encoding, DW_FORM_data1, Encoding); + } else if (TypedefDesc *TypedefTy = dyn_cast<TypedefDesc>(TyDesc)) { + Slot = Ty = new DIE(DW_TAG_typedef); + TypeDesc *FromTy = TypedefTy->getFromType(); + DIE *FromTyDie = NewType(Unit, FromTy); + CompileUnitDesc *File = TypedefTy->getFile(); + unsigned FileID = DebugInfo->RecordSource(File); + int Line = TypedefTy->getLine(); - Slot = Ty; - } else { - assert(0 && "Type not supported yet"); + Ty->AddDIEntry(DW_AT_type, DW_FORM_ref4, FromTyDie); + Ty->AddUInt (DW_AT_decl_file, 0, FileID); + Ty->AddUInt (DW_AT_decl_line, 0, Line); } + + assert(Ty && "Type not supported yet"); + // Add common information. + if (Size) Ty->AddUInt(DW_AT_byte_size, 0, Size); + if (!Name.empty()) Ty->AddString(DW_AT_name, DW_FORM_string, Name); + // Add to context owner. - Unit->AddChild(Slot); + Unit->AddChild(Ty); return Slot; } diff --git a/lib/CodeGen/MachineDebugInfo.cpp b/lib/CodeGen/MachineDebugInfo.cpp index 44b71fae53..1652881268 100644 --- a/lib/CodeGen/MachineDebugInfo.cpp +++ b/lib/CodeGen/MachineDebugInfo.cpp @@ -430,6 +430,7 @@ DebugInfoDesc *DebugInfoDesc::DescFactory(unsigned Tag) { case DI_TAG_global_variable: return new GlobalVariableDesc(); case DI_TAG_subprogram: return new SubprogramDesc(); case DI_TAG_basictype: return new BasicTypeDesc(); + case DI_TAG_typedef: return new TypedefDesc(); default: break; } return NULL; @@ -561,8 +562,6 @@ void CompileUnitDesc::dump() { //===----------------------------------------------------------------------===// -//===----------------------------------------------------------------------===// - TypeDesc::TypeDesc(unsigned T) : DebugInfoDesc(T) , Context(NULL) @@ -627,6 +626,37 @@ void BasicTypeDesc::dump() { << "Encoding(" << Encoding << ")\n"; } #endif +//===----------------------------------------------------------------------===// + +TypedefDesc::TypedefDesc() +: TypeDesc(DI_TAG_typedef) +, FromType(NULL) +, File(NULL) +, Line(0) +{} + +/// ApplyToFields - Target the visitor to the fields of the TypedefDesc. +/// +void TypedefDesc::ApplyToFields(DIVisitor *Visitor) { + TypeDesc::ApplyToFields(Visitor); + + Visitor->Apply((DebugInfoDesc *&)FromType); + Visitor->Apply((DebugInfoDesc *&)File); + Visitor->Apply(Line); +} + +#ifndef NDEBUG +void TypedefDesc::dump() { + std::cerr << getDescString() << " " + << "Tag(" << getTag() << "), " + << "Context(" << getContext() << "), " + << "Name(\"" << getName() << "\"), " + << "Size(" << getSize() << "), " + << "FromType(" << FromType << "), " + << "File(" << File << "), " + << "Line(" << Line << ")\n"; +} +#endif //===----------------------------------------------------------------------===// |