From 012fc4e9d9b66b3ffb7838b0e29dadbb4863ee69 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 8 Jan 2016 15:58:19 +0000 Subject: Don't encode a DexRegisterMap if there is no live register. Change-Id: I76a291e6a0ac37f0590d16c7f5b866115588bc55 --- compiler/optimizing/stack_map_stream.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/optimizing/stack_map_stream.cc') diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc index c60a4eacaa..4784de1380 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -270,7 +270,7 @@ void StackMapStream::FillIn(MemoryRegion region) { 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 { -- cgit v1.2.3-59-g8ed1b