From 505ebb0e7b42e7facc8354515b06333ee8b84b10 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 2 Apr 2014 15:24:05 +0100 Subject: [PATCH] Inlining synthetic accessors. Bug: 11549140 Change-Id: Ie0034a6840b1beaa3df92f26bf9d315119c81e34 --- compiler/dex/quick/dex_file_method_inliner.cc | 12 ++++++++++-- runtime/quick/inline_method_analyser.cc | 28 +++++++++++++++++++-------- runtime/quick/inline_method_analyser.h | 4 ++++ 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/compiler/dex/quick/dex_file_method_inliner.cc b/compiler/dex/quick/dex_file_method_inliner.cc index 2d738c575..06eff4e17 100644 --- a/compiler/dex/quick/dex_file_method_inliner.cc +++ b/compiler/dex/quick/dex_file_method_inliner.cc @@ -647,7 +647,11 @@ bool DexFileMethodInliner::GenInlineIGet(MIRGraph* mir_graph, BasicBlock* bb, MI bool object_is_this = (data.method_is_static == 0u && data.object_arg == 0u); if (!object_is_this) { // TODO: Implement inlining of IGET on non-"this" registers (needs correct stack trace for NPE). - return false; + // Allow synthetic accessors. We don't care about losing their stack frame in NPE. + if (!InlineMethodAnalyser::IsSyntheticAccessor( + mir_graph->GetMethodLoweringInfo(invoke).GetTargetMethod())) { + return false; + } } if (object_is_this) { @@ -706,7 +710,11 @@ bool DexFileMethodInliner::GenInlineIPut(MIRGraph* mir_graph, BasicBlock* bb, MI bool object_is_this = (data.method_is_static == 0u && data.object_arg == 0u); if (!object_is_this) { // TODO: Implement inlining of IPUT on non-"this" registers (needs correct stack trace for NPE). - return false; + // Allow synthetic accessors. We don't care about losing their stack frame in NPE. + if (!InlineMethodAnalyser::IsSyntheticAccessor( + mir_graph->GetMethodLoweringInfo(invoke).GetTargetMethod())) { + return false; + } } if (object_is_this) { diff --git a/runtime/quick/inline_method_analyser.cc b/runtime/quick/inline_method_analyser.cc index 0a1b72e6b..8bd8dbab7 100644 --- a/runtime/quick/inline_method_analyser.cc +++ b/runtime/quick/inline_method_analyser.cc @@ -135,6 +135,12 @@ bool InlineMethodAnalyser::AnalyseMethodCode(verifier::MethodVerifier* verifier, } } +bool InlineMethodAnalyser::IsSyntheticAccessor(MethodReference ref) { + const DexFile::MethodId& method_id = ref.dex_file->GetMethodId(ref.dex_method_index); + const char* method_name = ref.dex_file->GetMethodName(method_id); + return strncmp(method_name, "access$", strlen("access$")) == 0; +} + bool InlineMethodAnalyser::AnalyseReturnMethod(const DexFile::CodeItem* code_item, InlineMethod* result) { const Instruction* return_instruction = Instruction::At(code_item->insns_); @@ -226,8 +232,11 @@ bool InlineMethodAnalyser::AnalyseIGetMethod(verifier::MethodVerifier* verifier, } if ((verifier->GetAccessFlags() & kAccStatic) != 0u || object_arg != 0u) { - // TODO: Support inlining IGET on other register than "this". - return false; + // TODO: Implement inlining of IGET on non-"this" registers (needs correct stack trace for NPE). + // Allow synthetic accessors. We don't care about losing their stack frame in NPE. + if (!IsSyntheticAccessor(verifier->GetMethodReference())) { + return false; + } } // InlineIGetIPutData::object_arg is only 4 bits wide. @@ -244,9 +253,9 @@ bool InlineMethodAnalyser::AnalyseIGetMethod(verifier::MethodVerifier* verifier, result->opcode = kInlineOpIGet; result->flags = kInlineSpecial; data->op_variant = IGetVariant(opcode); - data->method_is_static = (verifier->GetAccessFlags() & kAccStatic) != 0 ? 1u : 0u; + data->method_is_static = (verifier->GetAccessFlags() & kAccStatic) != 0u ? 1u : 0u; data->object_arg = object_arg; // Allow IGET on any register, not just "this". - data->src_arg = 0; + data->src_arg = 0u; data->return_arg_plus1 = 0u; } return true; @@ -287,9 +296,12 @@ bool InlineMethodAnalyser::AnalyseIPutMethod(verifier::MethodVerifier* verifier, uint32_t object_arg = object_reg - arg_start; uint32_t src_arg = src_reg - arg_start; - if ((verifier->GetAccessFlags() & kAccStatic) != 0 || object_arg != 0) { - // TODO: Support inlining IPUT on other register than "this". - return false; + if ((verifier->GetAccessFlags() & kAccStatic) != 0u || object_arg != 0u) { + // TODO: Implement inlining of IPUT on non-"this" registers (needs correct stack trace for NPE). + // Allow synthetic accessors. We don't care about losing their stack frame in NPE. + if (!IsSyntheticAccessor(verifier->GetMethodReference())) { + return false; + } } // InlineIGetIPutData::object_arg/src_arg/return_arg_plus1 are each only 4 bits wide. @@ -308,7 +320,7 @@ bool InlineMethodAnalyser::AnalyseIPutMethod(verifier::MethodVerifier* verifier, result->opcode = kInlineOpIPut; result->flags = kInlineSpecial; data->op_variant = IPutVariant(opcode); - data->method_is_static = (verifier->GetAccessFlags() & kAccStatic) != 0 ? 1u : 0u; + data->method_is_static = (verifier->GetAccessFlags() & kAccStatic) != 0u ? 1u : 0u; data->object_arg = object_arg; // Allow IPUT on any register, not just "this". data->src_arg = src_arg; data->return_arg_plus1 = return_arg_plus1; diff --git a/runtime/quick/inline_method_analyser.h b/runtime/quick/inline_method_analyser.h index 277a01e50..ddee89b7b 100644 --- a/runtime/quick/inline_method_analyser.h +++ b/runtime/quick/inline_method_analyser.h @@ -21,6 +21,7 @@ #include "base/mutex.h" #include "dex_file.h" #include "dex_instruction.h" +#include "method_reference.h" /* * NOTE: This code is part of the quick compiler. It lives in the runtime @@ -156,6 +157,9 @@ class InlineMethodAnalyser { return opcode - Instruction::IPUT; } + // Determines whether the method is a synthetic accessor (method name starts with "access$"). + static bool IsSyntheticAccessor(MethodReference ref); + private: static bool AnalyseReturnMethod(const DexFile::CodeItem* code_item, InlineMethod* result); static bool AnalyseConstMethod(const DexFile::CodeItem* code_item, InlineMethod* result); -- 2.11.0