[llvm-commits] [llvm] r103309 - /llvm/trunk/lib/VMCore/AsmWriter.cpp

Chris Lattner clattner at apple.com
Sat May 8 10:40:23 PDT 2010


On May 7, 2010, at 3:15 PM, Dan Gohman wrote:

> Author: djg
> Date: Fri May  7 17:15:24 2010
> New Revision: 103309
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=103309&view=rev
> Log:
> Minimally fix this code to not abort on mdnodes with integer data
> wider than 64 bits.

Does APInt::getLimitedValue() work for this?

> 
> Modified:
>    llvm/trunk/lib/VMCore/AsmWriter.cpp
> 
> Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=103309&r1=103308&r2=103309&view=diff
> ==============================================================================
> --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
> +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Fri May  7 17:15:24 2010
> @@ -2024,9 +2024,9 @@
>     return;
>   ConstantInt *CI = dyn_cast_or_null<ConstantInt>(Node->getOperand(0));
>   if (!CI) return;
> -  unsigned Val = CI->getZExtValue();
> -  unsigned Tag = Val & ~LLVMDebugVersionMask;
> -  if (Val < LLVMDebugVersion)
> +  APInt Val = CI->getValue();
> +  APInt Tag = Val & ~APInt(Val.getBitWidth(), LLVMDebugVersionMask);
> +  if (Val.ult(LLVMDebugVersion))
>     return;
> 
>   Out.PadToColumn(50);
> @@ -2040,8 +2040,10 @@
>     Out << "; [ DW_TAG_vector_type ]";
>   else if (Tag == dwarf::DW_TAG_user_base)
>     Out << "; [ DW_TAG_user_base ]";
> -  else if (const char *TagName = dwarf::TagString(Tag))
> -    Out << "; [ " << TagName << " ]";
> +  else if (Tag.isIntN(32)) {
> +    if (const char *TagName = dwarf::TagString(Tag.getZExtValue()))
> +      Out << "; [ " << TagName << " ]";
> +  }
> }
> 
> void AssemblyWriter::writeAllMDNodes() {
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits





More information about the llvm-commits mailing list