replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MC: correct DWARF header for PE/COFF assembly input 

The header contains an offset to the DWARF abbreviations for the CU.  The offset
must be section relative for COFF and absolute for others.  The non-assembly
code path for the DWARF header generation already had the correct emission for
the headers.  This corrects just the assembly path.  Due to the invalid
relocation, processing of the debug information would halt previously on the
first assembly input as the associated abbreviations would be out of range as
they would have the location increased by image base and the section offset.

This address PR20332.

llvm-svn: 213275
This commit is contained in:
Saleem Abdulrasool 2014-07-17 16:27:44 +00:00
parent 862e60c75c
commit 7d09530cef
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/MC/MCDwarf.cpp
View File

@ -657,11 +657,12 @@ static void EmitGenDwarfInfo(MCStreamer *MCOS,
// The 4 byte offset to the debug abbrevs from the start of the .debug_abbrev,
// it is at the start of that section so this is zero.
if (AbbrevSectionSymbol) {
MCOS->EmitSymbolValue(AbbrevSectionSymbol, 4);
} else {
if (AbbrevSectionSymbol == nullptr)
MCOS->EmitIntValue(0, 4);
}
else if (context.getAsmInfo()->needsDwarfSectionOffsetDirective())
MCOS->EmitCOFFSecRel32(AbbrevSectionSymbol);
else
MCOS->EmitSymbolValue(AbbrevSectionSymbol, 4);
const MCAsmInfo *asmInfo = context.getAsmInfo();
int AddrSize = asmInfo->getPointerSize();

22
llvm/test/DebugInfo/X86/dbg-asm.s Normal file
View File

@ -0,0 +1,22 @@
# RUN: llvm-mc -triple i686-windows-gnu -g %s -filetype obj -o - \
# RUN: | llvm-readobj -r - | FileCheck -check-prefix CHECK-COFF %s
# RUN: llvm-mc -triple i686-windows-itanium -g %s -filetype obj -o - \
# RUN: | llvm-readobj -r - | FileCheck -check-prefix CHECK-COFF %s
# RUN: llvm-mc -triple i686-linux-gnu -g %s -filetype obj -o - \
# RUN: | llvm-readobj -r - | FileCheck -check-prefix CHECK-ELF %s
_a:
movl $65, %eax
ret
# CHECK-COFF: Relocations [
# CHECK-COFF: Section {{.*}} .debug_info {
# CHECK-COFF: 0x6 IMAGE_REL_I386_SECREL .debug_abbrev
# CHECK-COFF: }
# CHECK-COFF: ]
# CHECK-ELF: Relocations [
# CHECK-ELF: Section {{.*}} .rel.debug_info {
# CHECK-ELF: 0x6 R_386_32 .debug_abbrev
# CHECK-ELF: }
# CHECK-ELF: ]