diff options
author | Devang Patel <dpatel@apple.com> | 2011-06-01 00:23:24 +0000 |
---|---|---|
committer | Devang Patel <dpatel@apple.com> | 2011-06-01 00:23:24 +0000 |
commit | c20bdf194ad4c824ee6a5f163410d73513ae5c81 (patch) | |
tree | d61fcd6ca1ec821c571d6b9591a20fa642e9fe49 /lib/CodeGen | |
parent | 66658e4dff51664a53c56dd729b8abe4d57aadef (diff) | |
download | llvm-c20bdf194ad4c824ee6a5f163410d73513ae5c81.tar.gz llvm-c20bdf194ad4c824ee6a5f163410d73513ae5c81.tar.bz2 llvm-c20bdf194ad4c824ee6a5f163410d73513ae5c81.tar.xz |
Incomplete type may not have corresponding DIE, so do not check DIEEntry eagerly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@132377 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
-rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp | 9 | ||||
-rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfCompileUnit.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp index f128308fb6..bff1a35299 100644 --- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp @@ -609,16 +609,17 @@ void CompileUnit::addType(DIE *Entity, DIType Ty) { // If this is a complete composite type then include it in the // list of global types. - addGlobalType(Ty, Entry->getEntry()); + addGlobalType(Ty); } /// addGlobalType - Add a new global type to the compile unit. /// -void CompileUnit::addGlobalType(DIType Ty, DIE *Die) { +void CompileUnit::addGlobalType(DIType Ty) { DIDescriptor Context = Ty.getContext(); if (Ty.isCompositeType() && !Ty.getName().empty() && !Ty.isForwardDecl() && (Context.isCompileUnit() || Context.isFile() || Context.isNameSpace())) - GlobalTypes[Ty.getName()] = Die; + if (DIEEntry *Entry = getDIEEntry(Ty)) + GlobalTypes[Ty.getName()] = Entry->getEntry(); } /// addPubTypes - Add type for pubtypes section. @@ -633,7 +634,7 @@ void CompileUnit::addPubTypes(DISubprogram SP) { DIType ATy(Args.getElement(i)); if (!ATy.Verify()) continue; - addGlobalType(ATy, getDIEEntry(ATy)->getEntry()); + addGlobalType(ATy); } } diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h index 3cfbd73ef8..60a9b2872b 100644 --- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h +++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h @@ -87,7 +87,7 @@ public: /// addGlobalType - Add a new global type to the compile unit. /// - void addGlobalType(DIType Ty, DIE *Die); + void addGlobalType(DIType Ty); /// getDIE - Returns the debug information entry map slot for the /// specified debug variable. |