From 141de8c4cf18923b4ee773a455102734ca9e4407 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 23 Mar 2016 08:22:12 +0000 Subject: [PATCH] Revert "ART: Weaken DCHECK" Change that triggered this got reverted. This "fix" needs more investigation. This reverts commit 1ee29d3dd3fbbf5df7821b70f45c49275c878e63. Change-Id: Iee9e88f0e993edc0c7212e36d48ded1d31209156 --- runtime/quick/inline_method_analyser.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/runtime/quick/inline_method_analyser.cc b/runtime/quick/inline_method_analyser.cc index 7636f845d..c7ccee212 100644 --- a/runtime/quick/inline_method_analyser.cc +++ b/runtime/quick/inline_method_analyser.cc @@ -320,11 +320,8 @@ bool DoAnalyseConstructor(const DexFile::CodeItem* code_item, return false; } if (target_method->GetDeclaringClass()->IsObjectClass()) { - if (kIsDebugBuild) { - Instruction::Code op = Instruction::At(target_method->GetCodeItem()->insns_)->Opcode(); - DCHECK(op == Instruction::RETURN_VOID || op == Instruction::RETURN_VOID_NO_BARRIER) - << op; - } + DCHECK_EQ(Instruction::At(target_method->GetCodeItem()->insns_)->Opcode(), + Instruction::RETURN_VOID); } else { const DexFile::CodeItem* target_code_item = target_method->GetCodeItem(); if (target_code_item == nullptr) { -- 2.11.0