From d486d104b5e533e539bc73cc517e62cc5577e7dd Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Wed, 2 Apr 2014 02:04:51 +0000 Subject: [PATCH] Adjust comments regarding non-relocated abbrev offset in debug_info.dwo I'm not sure the comment in the implementation really adds a lot of value (it's clear that we emit zero when no symbol is provided, but it doesn't explain why we would do that). Happy to iterate. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205386 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 4 +++- lib/CodeGen/AsmPrinter/DwarfUnit.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 9deb2f50f57..11345eb288a 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -2709,7 +2709,9 @@ DwarfTypeUnit *DwarfDebug::constructSkeletonTU(DwarfTypeUnit *TU) { // compile units that would normally be in debug_info. void DwarfDebug::emitDebugInfoDWO() { assert(useSplitDwarf() && "No split dwarf debug info?"); - InfoHolder.emitUnits(this, nullptr); + // Don't pass an abbrev symbol, using a constant zero instead so as not to + // emit relocations into the dwo file. + InfoHolder.emitUnits(this, /* AbbrevSymbol */nullptr); } // Emit the .debug_abbrev.dwo section for separated dwarf. This contains the diff --git a/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfUnit.cpp index dc3917b5857..97f251086ae 100644 --- a/lib/CodeGen/AsmPrinter/DwarfUnit.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfUnit.cpp @@ -2040,7 +2040,7 @@ void DwarfUnit::emitHeader(const MCSymbol *ASectionSym) const { if (ASectionSym) Asm->EmitSectionOffset(ASectionSym, ASectionSym); else - // Use a constant value in the dwo file, to avoid relocations + // Use a constant value when no symbol is provided. Asm->EmitInt32(0); Asm->OutStreamer.AddComment("Address Size (in bytes)"); Asm->EmitInt8(Asm->getDataLayout().getPointerSize()); -- 2.34.1