Commit 0bd48c3d authored by Sterling Augustine's avatar Sterling Augustine Committed by David Blaikie
Browse files

[DebugInfo] Support file-level include directories when generating DWARFv5 LineTable prologues. 

Differential Revision: https://reviews.llvm.org/D74249
parent c1adb88a

llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void checkDefaultPrologue(uint16_t Version, DwarfFormat Format, 
    UnitLength = PrologueLength + 2;

    break;

  case 5:

    PrologueLength = 39;

    PrologueLength = 42;

    UnitLength = PrologueLength + 4;

    EXPECT_EQ(Prologue.getAddressSize(), 8u);

    EXPECT_EQ(Prologue.SegSelectorSize, 0u);
@@ -204,6 +204,7 @@ void checkDefaultPrologue(uint16_t Version, DwarfFormat Format, 
  EXPECT_STREQ(*Prologue.IncludeDirectories[0].getAsCString(), "a dir");

  ASSERT_EQ(Prologue.FileNames.size(), 1u);

  ASSERT_EQ(Prologue.FileNames[0].Name.getForm(), DW_FORM_string);

  ASSERT_EQ(Prologue.FileNames[0].DirIdx, 0u);

  EXPECT_STREQ(*Prologue.FileNames[0].Name.getAsCString(), "a file");

}

llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp

+6 −3
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ DWARFDebugLine::Prologue dwarfgen::LineTable::createBasicPrologue() const { 
    P.PrologueLength = 36;

    break;

  case 5:

    P.TotalLength = 47;

    P.PrologueLength = 39;

    P.TotalLength = 50;

    P.PrologueLength = 42;

    P.FormParams.AddrSize = AddrSize;

    break;

  default:
@@ -343,13 +343,16 @@ static void writeV5IncludeAndFileTable(const DWARFDebugLine::Prologue &Prologue, 
    writeCString(*Include.getAsCString(), Asm);

  }



  Asm.emitInt8(1); // file_name_entry_format_count.

  Asm.emitInt8(2); // file_name_entry_format_count.

  Asm.EmitULEB128(DW_LNCT_path);

  Asm.EmitULEB128(DW_FORM_string);

  Asm.EmitULEB128(DW_LNCT_directory_index);

  Asm.EmitULEB128(DW_FORM_data1);

  Asm.EmitULEB128(Prologue.FileNames.size());

  for (auto File : Prologue.FileNames) {

    assert(File.Name.getAsCString() && "expected a string form for file name");

    writeCString(*File.Name.getAsCString(), Asm);

    Asm.emitInt8(File.DirIdx);

  }

}