From d97e0828958fd14a962e37af2865bc2e628547ce Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Sun, 3 Jun 2018 12:00:24 +0100 Subject: Reduce code repetition in stack maps with macros. Simplifies the code somewhat. It also makes it possible to get column names as strings for the debugging code. Test: test-art-host-gtest-stack_map_test Change-Id: I1a2e146e7a4372c0752693313e1b881cb4a818bc --- compiler/optimizing/stack_map_stream.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 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 d80e2fc0e3..3685ab2df4 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -129,7 +129,7 @@ void StackMapStream::AddInvoke(InvokeType invoke_type, uint32_t dex_method_index CHECK_EQ(invoke_info.GetNativePcOffset(instruction_set_), StackMap::UnpackNativePc(packed_native_pc, instruction_set_)); CHECK_EQ(invoke_info.GetInvokeType(), invoke_type); - CHECK_EQ(method_infos_[invoke_info.GetMethodIndexIdx()], dex_method_index); + CHECK_EQ(method_infos_[invoke_info.GetMethodInfoIndex()], dex_method_index); }); } } @@ -179,7 +179,7 @@ void StackMapStream::BeginInlineInfoEntry(ArtMethod* method, if (encode_art_method) { CHECK_EQ(inline_info.GetArtMethod(), method); } else { - CHECK_EQ(method_infos_[inline_info.GetMethodIndexIdx()], + CHECK_EQ(method_infos_[inline_info.GetMethodInfoIndex()], method->GetDexMethodIndexUnchecked()); } CHECK_EQ(inline_info.HasDexRegisterMap(), (num_dex_registers != 0)); -- cgit v1.2.3-59-g8ed1b