diff options
Diffstat (limited to 'runtime/quick/inline_method_analyser.cc')
-rw-r--r-- | runtime/quick/inline_method_analyser.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/runtime/quick/inline_method_analyser.cc b/runtime/quick/inline_method_analyser.cc index c7ccee2125..7636f845db 100644 --- a/runtime/quick/inline_method_analyser.cc +++ b/runtime/quick/inline_method_analyser.cc @@ -320,8 +320,11 @@ bool DoAnalyseConstructor(const DexFile::CodeItem* code_item, return false; } if (target_method->GetDeclaringClass()->IsObjectClass()) { - DCHECK_EQ(Instruction::At(target_method->GetCodeItem()->insns_)->Opcode(), - Instruction::RETURN_VOID); + if (kIsDebugBuild) { + Instruction::Code op = Instruction::At(target_method->GetCodeItem()->insns_)->Opcode(); + DCHECK(op == Instruction::RETURN_VOID || op == Instruction::RETURN_VOID_NO_BARRIER) + << op; + } } else { const DexFile::CodeItem* target_code_item = target_method->GetCodeItem(); if (target_code_item == nullptr) { |