commit b7070a2db8b0b7eca14f01f932be305be64ded57
author David Srbecky <dsrbecky@google.com> Fri Jan 08 18:13:53 2016 +0000
committer David Srbecky <dsrbecky@google.com> Mon Jan 11 12:22:17 2016 +0000
tree 06ba87d56a708712fb206e23d3abd55f21934373
parent ae6f23c83e1c8dcfbc4f74186ea1a37f1044414b

Generate Nops to ensure that debug stack maps have distinct PC.

Change-Id: I5740ec958a20d236634b66df0e675382ed5c16fc

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index b49f42b..b3d0945 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -2954,6 +2954,10 @@
 }
 
 void InstructionCodeGeneratorARM64::VisitNativeDebugInfo(HNativeDebugInfo* info) {
+  if (codegen_->HasStackMapAtCurrentPc()) {
+    // Ensure that we do not collide with the stack map of the previous instruction.
+    __ Nop();
+  }
   codegen_->RecordPcInfo(info, info->GetDexPc());
 }