From fc8b422c286501346b5b797420fb616aaa5e952a Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Sun, 17 Sep 2017 13:44:24 -0700 Subject: Clean up AtomicDexRefMap Make ClassReference, TypeReference, and MethodReference extend DexFileReference. This enables using all of these types as the key for AtomicDexRefMap. Test: test-art-host Bug: 63851220 Bug: 63756964 Change-Id: Ida3c94cadb53272cb5057e5cebc5971c1ab4d366 --- compiler/dex/inline_method_analyser.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/dex/inline_method_analyser.cc') diff --git a/compiler/dex/inline_method_analyser.cc b/compiler/dex/inline_method_analyser.cc index 54ddc2188b..c8e3d5edd8 100644 --- a/compiler/dex/inline_method_analyser.cc +++ b/compiler/dex/inline_method_analyser.cc @@ -509,7 +509,7 @@ bool InlineMethodAnalyser::AnalyseMethodCode(const DexFile::CodeItem* code_item, } bool InlineMethodAnalyser::IsSyntheticAccessor(MethodReference ref) { - const DexFile::MethodId& method_id = ref.dex_file->GetMethodId(ref.dex_method_index); + const DexFile::MethodId& method_id = ref.dex_file->GetMethodId(ref.index); const char* method_name = ref.dex_file->GetMethodName(method_id); // javac names synthetic accessors "access$nnn", // jack names them "-getN", "-putN", "-wrapN". -- cgit v1.2.3-59-g8ed1b