commit | e39765cd311f31653137a2efede6c0eb7903e434 | [log] [tgz] |
---|---|---|
author | David Srbecky <dsrbecky@google.com> | Fri Feb 15 15:08:00 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Feb 15 15:08:00 2019 +0000 |
tree | 83d299c1edbcfa10ee812437c21195afa4c3898c | |
parent | 18d70c19fd2122db62f867bcb73a53ed3331197e [diff] | |
parent | 300218472729b91591bd39754684fb16ea56c4de [diff] |
Merge "Generate CFI for stackless methods."
diff --git a/compiler/debug/elf_debug_writer.cc b/compiler/debug/elf_debug_writer.cc index 78c02b6..fd638b7 100644 --- a/compiler/debug/elf_debug_writer.cc +++ b/compiler/debug/elf_debug_writer.cc
@@ -221,8 +221,7 @@ num_cfis++; }); DCHECK_EQ(num_syms, 1u); - // CFI might be missing. TODO: Ensure we have CFI for all methods. - DCHECK_LE(num_cfis, 1u); + DCHECK_EQ(num_cfis, 1u); } return buffer; }
diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc index 8204f1e..9c155f8 100644 --- a/compiler/optimizing/code_generator_arm_vixl.cc +++ b/compiler/optimizing/code_generator_arm_vixl.cc
@@ -2093,6 +2093,8 @@ } if (HasEmptyFrame()) { + // Ensure that the CFI opcode list is not empty. + GetAssembler()->cfi().Nop(); return; }