Commit 97ba8458 authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r143194: 

------------------------------------------------------------------------
r143194 | chapuni | 2011-10-28 07:12:22 -0700 (Fri, 28 Oct 2011) | 7 lines

Dwarf: [PR11022] Fix emitting DW_AT_const_value(>i64), to be host-endian-neutral.

Don't assume APInt::getRawData() would hold target-aware endianness nor host-compliant endianness. rawdata[0] holds most lower i64, even on big endian host.

FIXME: Add a testcase for big endian target.

FIXME: Ditto on CompileUnit::addConstantFPValue() ?
------------------------------------------------------------------------

llvm-svn: 143449
parent 49101946

llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp

+9 −7
Original line number Diff line number Diff line
@@ -527,18 +527,20 @@ bool CompileUnit::addConstantValue(DIE *Die, const ConstantInt *CI, 


  // Get the raw data form of the large APInt.

  const APInt Val = CI->getValue();

  const char *Ptr = (const char*)Val.getRawData();

  const uint64_t *Ptr64 = Val.getRawData();



  int NumBytes = Val.getBitWidth() / 8; // 8 bits per byte.

  bool LittleEndian = Asm->getTargetData().isLittleEndian();

  int Incr = (LittleEndian ? 1 : -1);

  int Start = (LittleEndian ? 0 : NumBytes - 1);

  int Stop = (LittleEndian ? NumBytes : -1);



  // Output the constant to DWARF one byte at a time.

  for (; Start != Stop; Start += Incr)

    addUInt(Block, 0, dwarf::DW_FORM_data1,

            (unsigned char)0xFF & Ptr[Start]);

  for (int i = 0; i < NumBytes; i++) {

    uint8_t c;

    if (LittleEndian)

      c = Ptr64[i / 8] >> (8 * (i & 7));

    else

      c = Ptr64[(NumBytes - 1 - i) / 8] >> (8 * ((NumBytes - 1 - i) & 7));

    addUInt(Block, 0, dwarf::DW_FORM_data1, c);

  }



  addBlock(Die, dwarf::DW_AT_const_value, 0, Block);

  return true;

llvm/test/CodeGen/X86/dbg-i128-const.ll

+1 −1
Original line number Diff line number Diff line 
; RUN: llc < %s | FileCheck %s

; RUN: llc -mtriple=x86_64-linux < %s | FileCheck %s



; CHECK: DW_AT_const_value

; CHECK-NEXT: 42