diff options
| author | 2016-03-23 05:05:36 +0000 | |
|---|---|---|
| committer | 2016-03-23 05:05:36 +0000 | |
| commit | 3e86d670e478459e3f82ac3e41dd7de809caed50 (patch) | |
| tree | d0a37a718f5f34ce763ee1ce27f60f2d4b3d3ee5 | |
| parent | 0197bb59a87583c2363cedd85a72bd401f38338b (diff) | |
| parent | 1ee29d3dd3fbbf5df7821b70f45c49275c878e63 (diff) | |
Merge "ART: Weaken DCHECK"
| -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) { |