diff options
| author | 2021-06-25 17:37:32 -0700 | |
|---|---|---|
| committer | 2021-07-01 00:37:35 +0000 | |
| commit | 546243375d7e129aa02ca7ea9663ed7c40b4880e (patch) | |
| tree | adc158db1f6d6d6c482ac88462ad687a63d8267d /compiler/debug/dwarf/dwarf_test.cc | |
| parent | 7ffab8106445905d30fdef6291ebd18765c961f0 (diff) | |
libelffile: move to DWARF3 when writing .debug_frame.
zR augmentation in .debug_frame isn't recognized by llvm-dwarfdump.
This leads to below test failure after compiler update:
DwarfTest.DebugFrame
DwarfTest.x86_64_RegisterMapping
So switch to DWARF3, which supports 64-bit format without using zR
augmentation.
Bug: 192012848
Test: run art-test
Change-Id: Ib37c0bba7a293ae7b04c8cc0e9e09c045bcc0287
Diffstat (limited to 'compiler/debug/dwarf/dwarf_test.cc')
| -rw-r--r-- | compiler/debug/dwarf/dwarf_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/debug/dwarf/dwarf_test.cc b/compiler/debug/dwarf/dwarf_test.cc index 8897e45584..8fdc7ca63a 100644 --- a/compiler/debug/dwarf/dwarf_test.cc +++ b/compiler/debug/dwarf/dwarf_test.cc @@ -131,7 +131,7 @@ TEST_F(DwarfTest, DebugFrame) { CheckObjdumpOutput(is64bit, "-debug-frame"); } -TEST_F(DwarfTest, DISABLED_DebugFrame64) { +TEST_F(DwarfTest, DebugFrame64) { constexpr bool is64bit = true; DebugFrameOpCodeWriter<> initial_opcodes; WriteCIE(is64bit, Reg(16), initial_opcodes, &debug_frame_data_); @@ -143,7 +143,7 @@ TEST_F(DwarfTest, DISABLED_DebugFrame64) { 0x0200000000000000, ArrayRef<const uint8_t>(*opcodes.data()), &debug_frame_data_); - DW_CHECK("FDE cie=00000000 pc=100000000000000..300000000000000"); + DW_CHECK("FDE cie=00000000 pc=100000000000000...300000000000000"); CheckObjdumpOutput(is64bit, "-debug-frame"); } @@ -158,7 +158,7 @@ TEST_F(DwarfTest, x86_64_RegisterMapping) { opcodes.RelOffset(Reg::X86_64Core(i), 0); } DW_CHECK("FDE"); - DW_CHECK_NEXT("DWARF32"); + DW_CHECK_NEXT("DWARF64"); DW_CHECK_NEXT("DW_CFA_nop:"); // TODO: Why is a nop here. DW_CHECK_NEXT("DW_CFA_offset: RAX 0"); DW_CHECK_NEXT("DW_CFA_offset: RCX 0"); |