commit 012fc4e9d9b66b3ffb7838b0e29dadbb4863ee69
author Nicolas Geoffray <ngeoffray@google.com> Fri Jan 08 15:58:19 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Jan 08 17:14:17 2016 +0000
tree abba308e56a3d81e5c3fceebc95fb37a0ffe9c7c
parent 5ee288c9dd99614e3a238f5efceeec6456e3499d

Don't encode a DexRegisterMap if there is no live register.

Change-Id: I76a291e6a0ac37f0590d16c7f5b866115588bc55

compiler/optimizing/stack_map_stream.cc

diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc
index c60a4ea..4784de1 100644
--- a/compiler/optimizing/stack_map_stream.cc
+++ b/compiler/optimizing/stack_map_stream.cc
@@ -270,7 +270,7 @@
       stack_map.SetStackMask(stack_map_encoding_, *entry.sp_mask);
     }
 
-    if (entry.num_dex_registers == 0) {
+    if (entry.num_dex_registers == 0 || (entry.live_dex_registers_mask->NumSetBits() == 0)) {
       // No dex map available.
       stack_map.SetDexRegisterMapOffset(stack_map_encoding_, StackMap::kNoDexRegisterMap);
     } else {