diff options
Diffstat (limited to 'runtime/quick/inline_method_analyser.cc')
| -rw-r--r-- | runtime/quick/inline_method_analyser.cc | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/runtime/quick/inline_method_analyser.cc b/runtime/quick/inline_method_analyser.cc index 8bd8dba..0a1b72e 100644 --- a/runtime/quick/inline_method_analyser.cc +++ b/runtime/quick/inline_method_analyser.cc @@ -135,12 +135,6 @@ 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_); @@ -232,11 +226,8 @@ bool InlineMethodAnalyser::AnalyseIGetMethod(verifier::MethodVerifier* verifier, } if ((verifier->GetAccessFlags() & kAccStatic) != 0u || object_arg != 0u) { - // 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; - } + // TODO: Support inlining IGET on other register than "this". + return false; } // InlineIGetIPutData::object_arg is only 4 bits wide. @@ -253,9 +244,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) != 0u ? 1u : 0u; + data->method_is_static = (verifier->GetAccessFlags() & kAccStatic) != 0 ? 1u : 0u; data->object_arg = object_arg; // Allow IGET on any register, not just "this". - data->src_arg = 0u; + data->src_arg = 0; data->return_arg_plus1 = 0u; } return true; @@ -296,12 +287,9 @@ 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) != 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; - } + if ((verifier->GetAccessFlags() & kAccStatic) != 0 || object_arg != 0) { + // TODO: Support inlining IPUT on other register than "this". + return false; } // InlineIGetIPutData::object_arg/src_arg/return_arg_plus1 are each only 4 bits wide. @@ -320,7 +308,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) != 0u ? 1u : 0u; + data->method_is_static = (verifier->GetAccessFlags() & kAccStatic) != 0 ? 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; |