From 8f20a23a35fa6fbe4dcb4ff70268a24dc7fb2a24 Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Tue, 12 Feb 2019 19:42:54 +0000 Subject: Revert "Add code size to CodeInfo" This reverts commit 68efa7b1128486e08ae60cd27181645b27bbd2e4. Reason for revert: Breaks tests Change-Id: I28fb143990f58e0d5f0b106bea9d9a159f19297e --- compiler/optimizing/stack_map_stream.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (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 e87f3c80ad..60ca61c133 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -54,10 +54,9 @@ void StackMapStream::BeginMethod(size_t frame_size_in_bytes, num_dex_registers_ = num_dex_registers; } -void StackMapStream::EndMethod(size_t code_size) { +void StackMapStream::EndMethod() { DCHECK(in_method_) << "Mismatched Begin/End calls"; in_method_ = false; - packed_code_size_ = StackMap::PackNativePc(code_size, instruction_set_); // Read the stack masks now. The compiler might have updated them. for (size_t i = 0; i < lazy_stack_masks_.size(); i++) { @@ -67,10 +66,6 @@ void StackMapStream::EndMethod(size_t code_size) { stack_masks_.Dedup(stack_mask->GetRawStorage(), stack_mask->GetNumberOfBits()); } } - - for (size_t i = 0; i < stack_maps_.size(); i++) { - DCHECK_LE(stack_maps_[i][StackMap::kPackedNativePc], packed_code_size_); - } } void StackMapStream::BeginStackMapEntry(uint32_t dex_pc, @@ -301,7 +296,6 @@ ScopedArenaVector StackMapStream::Encode() { ScopedArenaVector buffer(allocator_->Adapter(kArenaAllocStackMapStream)); BitMemoryWriter> out(&buffer); - out.WriteVarint(packed_code_size_); out.WriteVarint(packed_frame_size_); out.WriteVarint(core_spill_mask_); out.WriteVarint(fp_spill_mask_); -- cgit v1.2.3-59-g8ed1b