2 files changed, 7 insertions, 7 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");
diff --git a/compiler/debug/elf_debug_writer.cc b/compiler/debug/elf_debug_writer.cc
index 765a81d4f8..d0ca6db005 100644
--- a/compiler/debug/elf_debug_writer.cc
+++ b/compiler/debug/elf_debug_writer.cc
@@ -215,8 +215,8 @@ std::vector<uint8_t> MakeElfFileForJIT(
     reader.VisitDebugFrame([&](const Reader::CIE* cie ATTRIBUTE_UNUSED) {
       num_cies++;
     }, [&](const Reader::FDE* fde, const Reader::CIE* cie ATTRIBUTE_UNUSED) {
-      DCHECK_EQ(fde->sym_addr, method_info.code_address);
-      DCHECK_EQ(fde->sym_size, method_info.code_size);
+      DCHECK_EQ(fde->sym_addr(), method_info.code_address);
+      DCHECK_EQ(fde->sym_size(), method_info.code_size);
       num_fdes++;
     });
     DCHECK_EQ(num_syms, 1u);
@@ -308,8 +308,8 @@ std::vector<uint8_t> PackElfFileForJIT(
         }
       }, [&](const Reader::FDE* fde, const Reader::CIE* cie ATTRIBUTE_UNUSED) {
         DCHECK(copied_cie);
-        DCHECK_EQ(fde->cie_pointer, 0);
-        if (!is_removed_symbol(fde->sym_addr)) {
+        DCHECK_EQ(fde->cie_pointer(), 0);
+        if (!is_removed_symbol(fde->sym_addr())) {
           debug_frame->WriteFully(fde->data(), fde->size());
         }
       });