From e7a9194558379ee24fde82fcaeaee29542df1520 Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Wed, 1 Aug 2018 17:23:53 +0100 Subject: Simplify StackMapStream encoding. Test: test-art-host-gtest-stack_map_test Change-Id: Ife021d03e4e486043ec609f9af8673ace7bde497 --- compiler/exception_test.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'compiler/exception_test.cc') diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc index b0e03374a0..fd17364c26 100644 --- a/compiler/exception_test.cc +++ b/compiler/exception_test.cc @@ -81,7 +81,9 @@ class ExceptionTest : public CommonRuntimeTest { stack_maps.BeginStackMapEntry(kDexPc, native_pc_offset); stack_maps.EndStackMapEntry(); stack_maps.EndMethod(); - const size_t stack_maps_size = stack_maps.PrepareForFillIn(); + ScopedArenaVector stack_map = stack_maps.Encode(); + + const size_t stack_maps_size = stack_map.size(); const size_t header_size = sizeof(OatQuickMethodHeader); const size_t code_alignment = GetInstructionSetAlignment(kRuntimeISA); @@ -90,9 +92,8 @@ class ExceptionTest : public CommonRuntimeTest { uint8_t* code_ptr = AlignUp(&fake_header_code_and_maps_[stack_maps_size + header_size], code_alignment); - MemoryRegion stack_maps_region(&fake_header_code_and_maps_[0], stack_maps_size); - stack_maps.FillInCodeInfo(stack_maps_region); - OatQuickMethodHeader method_header(code_ptr - stack_maps_region.begin(), code_size); + memcpy(&fake_header_code_and_maps_[0], stack_map.data(), stack_maps_size); + OatQuickMethodHeader method_header(code_ptr - fake_header_code_and_maps_.data(), code_size); static_assert(std::is_trivially_copyable::value, "Cannot use memcpy"); memcpy(code_ptr - header_size, &method_header, header_size); memcpy(code_ptr, fake_code_.data(), fake_code_.size()); -- cgit v1.2.3-59-g8ed1b