diff options
| author | 2016-01-14 12:22:39 +0000 | |
|---|---|---|
| committer | 2016-01-14 12:22:39 +0000 | |
| commit | da88e5734f23d7bf215c7fd34c478225d450a530 (patch) | |
| tree | 054a508b49af1ce54b9696419cbdd1e5b15b1ce1 /compiler/optimizing/stack_map_stream.cc | |
| parent | 26751735568224bddd07eeb9218560833c3f4ee1 (diff) | |
| parent | 012fc4e9d9b66b3ffb7838b0e29dadbb4863ee69 (diff) | |
Merge "Don't encode a DexRegisterMap if there is no live register."
Diffstat (limited to 'compiler/optimizing/stack_map_stream.cc')
| -rw-r--r-- | compiler/optimizing/stack_map_stream.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |