| commit | 300218472729b91591bd39754684fb16ea56c4de | [log] [tgz] |
|---|---|---|
| author | David Srbecky <dsrbecky@google.com> | Wed Feb 13 14:19:36 2019 +0000 |
| committer | David Srbecky <dsrbecky@google.com> | Thu Feb 14 11:50:54 2019 +0000 |
| tree | e7f3b67ac3b39cea40d6be2d0ad5956ba81ad23e | |
| parent | d8c4a38b3fc37efdfe691c317b37e9808022f7a3 [diff] |
Generate CFI for stackless methods. Generate at least a single no-op. Otherwise it seems like CFI is missing. Bug: 122379755 Test: ART_HEAP_POISONING=true ART_USE_READ_BARRIER=true ./art/test.py -r -t 137 --jit --32 --target Change-Id: Id9206cb49ce976a03e1d50e6801abcefff537f60
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; }