diff options
| author | 2020-09-11 17:03:58 -0700 | |
|---|---|---|
| committer | 2020-09-22 16:39:51 +0000 | |
| commit | 331c8e371f2a3324070a4da966af8bf296b58bbb (patch) | |
| tree | 82ad282811d40e605bd7e0ad1c3be81ea3385e7f /compiler/debug/dwarf/dwarf_test.cc | |
| parent | 49cde240141d84bc0d79ed2225aff5b1a7f8a65e (diff) | |
Fix expected results for clang-r399163 update.
llvm-objdump changed the format it uses for displaying assembly, so we
must also adapt all of the ART tests similarly, since they check for
exact matching output. llvm-dwarfdump has similarly changed its outputs,
so we adjust our expectations there too.
Bug: http://b/155835175
Test: m test-art-host-gtest
Change-Id: Iefdb7b98b5f87d9c7bbad1930a4393919d9b9b34
Diffstat (limited to 'compiler/debug/dwarf/dwarf_test.cc')
| -rw-r--r-- | compiler/debug/dwarf/dwarf_test.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/compiler/debug/dwarf/dwarf_test.cc b/compiler/debug/dwarf/dwarf_test.cc index 062cfc9d2c..302624a273 100644 --- a/compiler/debug/dwarf/dwarf_test.cc +++ b/compiler/debug/dwarf/dwarf_test.cc @@ -43,6 +43,7 @@ TEST_F(DwarfTest, DebugFrame) { DebugFrameOpCodeWriter<> opcodes; DW_CHECK(".debug_frame contents:"); DW_CHECK("FDE"); + DW_CHECK_NEXT("DWARF32"); DW_CHECK_NEXT("DW_CFA_nop:"); // TODO: Why is a nop here. int pc = 0; for (int i : {0, 1, 0x3F, 0x40, 0xFF, 0x100, 0xFFFF, 0x10000}) { @@ -157,6 +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("DW_CFA_nop:"); // TODO: Why is a nop here. DW_CHECK_NEXT("DW_CFA_offset: reg0 0"); DW_CHECK_NEXT("DW_CFA_offset: reg2 0"); @@ -217,11 +219,6 @@ TEST_F(DwarfTest, DebugLine) { DW_CHECK_NEXT(" dir_index: 1"); DW_CHECK_NEXT(" mod_time: 0x000003e8"); DW_CHECK_NEXT(" length: 0x000007d0"); - DW_CHECK_NEXT("file_names[ 4]:"); - DW_CHECK_NEXT(" name: \"file.c\""); - DW_CHECK_NEXT(" dir_index: 0"); - DW_CHECK_NEXT(" mod_time: 0x000003e8"); - DW_CHECK_NEXT(" length: 0x000007d0"); opcodes.SetAddress(0x01000000); opcodes.SetIsStmt(true); @@ -303,7 +300,7 @@ TEST_F(DwarfTest, DebugInfo) { DebugInfoEntryWriter<> info(is64bit, &debug_abbrev); DW_CHECK(".debug_info contents:"); info.StartTag(dwarf::DW_TAG_compile_unit); - DW_CHECK_NEXT("Compile Unit: length = 0x00000030 version = 0x0004 abbr_offset = 0x0000 addr_size = 0x04"); + DW_CHECK_NEXT("Compile Unit: length = 0x00000030, format = DWARF32, version = 0x0004, abbr_offset = 0x0000, addr_size = 0x04"); DW_CHECK_NEXT("DW_TAG_compile_unit"); info.WriteStrp(dwarf::DW_AT_producer, "Compiler name", &debug_str_data_); DW_CHECK_NEXT(" DW_AT_producer (\"Compiler name\")"); |