From 29ba1b068fc9f5a8011782c147b1f7732928aac7 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Fri, 13 Mar 2015 11:45:07 +0000 Subject: Fix the computation of the size of the stack maps region. In art::StackMapStream::ComputeStackMapSize, compute the size of a CodeInfo's stack maps region using the stack mask size, not the maximum element of the stack mask. Also, rename this method as art::StackMapStream::ComputeStackMapsSize to make it clear it that it covers all the stack maps of the CodeInfo item, not just one stack map. Change-Id: Icad21946dbca6e1ade2b82c9c2c535fdfed110a9 --- compiler/optimizing/stack_map_stream.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'compiler/optimizing/stack_map_stream.h') diff --git a/compiler/optimizing/stack_map_stream.h b/compiler/optimizing/stack_map_stream.h index 76ddbf3204..8fb58d19a9 100644 --- a/compiler/optimizing/stack_map_stream.h +++ b/compiler/optimizing/stack_map_stream.h @@ -100,13 +100,17 @@ class StackMapStream : public ValueObject { size_t ComputeNeededSize() const { return CodeInfo::kFixedSize - + ComputeStackMapSize() + + ComputeStackMapsSize() + ComputeDexRegisterMapsSize() + ComputeInlineInfoSize(); } - size_t ComputeStackMapSize() const { - return stack_maps_.Size() * StackMap::ComputeAlignedStackMapSize(stack_mask_max_); + size_t ComputeStackMaskSize() const { + return StackMaskEncodingSize(stack_mask_max_); + } + + size_t ComputeStackMapsSize() const { + return stack_maps_.Size() * StackMap::ComputeAlignedStackMapSize(ComputeStackMaskSize()); } // Compute the size of the Dex register map of `entry`. @@ -141,7 +145,7 @@ class StackMapStream : public ValueObject { } size_t ComputeDexRegisterMapsStart() const { - return CodeInfo::kFixedSize + ComputeStackMapSize(); + return CodeInfo::kFixedSize + ComputeStackMapsSize(); } size_t ComputeInlineInfoStart() const { @@ -150,9 +154,10 @@ class StackMapStream : public ValueObject { void FillIn(MemoryRegion region) { CodeInfo code_info(region); + DCHECK_EQ(region.size(), ComputeNeededSize()); code_info.SetOverallSize(region.size()); - size_t stack_mask_size = StackMaskEncodingSize(stack_mask_max_); + size_t stack_mask_size = ComputeStackMaskSize(); uint8_t* memory_start = region.start(); MemoryRegion dex_register_maps_region = region.Subregion( @@ -165,6 +170,7 @@ class StackMapStream : public ValueObject { code_info.SetNumberOfStackMaps(stack_maps_.Size()); code_info.SetStackMaskSize(stack_mask_size); + DCHECK_EQ(code_info.StackMapsSize(), ComputeStackMapsSize()); uintptr_t next_dex_register_map_offset = 0; uintptr_t next_inline_info_offset = 0; -- cgit v1.2.3