From 5cb50c5bd54b54e3f6ef8d3f7fcaea92bfb08a0f Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Thu, 28 Jun 2012 00:41:44 +0000 Subject: Use the interface through DIDescriptor to get the tag/version for a debug info MDNode. llvm-svn: 159317 --- llvm/lib/VMCore/AsmWriter.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'llvm/lib/VMCore') diff --git a/llvm/lib/VMCore/AsmWriter.cpp b/llvm/lib/VMCore/AsmWriter.cpp index 9147b635126..99e2687bbe2 100644 --- a/llvm/lib/VMCore/AsmWriter.cpp +++ b/llvm/lib/VMCore/AsmWriter.cpp @@ -20,6 +20,7 @@ #include "llvm/LLVMContext.h" #include "llvm/CallingConv.h" #include "llvm/Constants.h" +#include "llvm/DebugInfo.h" #include "llvm/DerivedTypes.h" #include "llvm/InlineAsm.h" #include "llvm/IntrinsicInst.h" @@ -2031,20 +2032,21 @@ static void WriteMDNodeComment(const MDNode *Node, formatted_raw_ostream &Out) { if (Node->getNumOperands() < 1) return; - ConstantInt *CI = dyn_cast_or_null(Node->getOperand(0)); - if (!CI) return; - APInt Val = CI->getValue(); - APInt Tag = Val & ~APInt(Val.getBitWidth(), LLVMDebugVersionMask); - if (Val.ult(LLVMDebugVersion11)) + + Value *Op = Node->getOperand(0); + if (!Op || !isa(Op) || cast(Op)->getBitWidth() < 32) + return; + + DIDescriptor Desc(Node); + if (Desc.getVersion() < LLVMDebugVersion11) return; + unsigned Tag = Desc.getTag(); Out.PadToColumn(50); if (Tag == dwarf::DW_TAG_user_base) Out << "; [ DW_TAG_user_base ]"; - else if (Tag.isIntN(32)) { - if (const char *TagName = dwarf::TagString(Tag.getZExtValue())) - Out << "; [ " << TagName << " ]"; - } + else if (const char *TagName = dwarf::TagString(Tag)) + Out << "; [ " << TagName << " ]"; } void AssemblyWriter::writeAllMDNodes() { -- cgit v1.2.3