commit 1ee29d3dd3fbbf5df7821b70f45c49275c878e63
author Andreas Gampe <agampe@google.com> Tue Mar 22 22:03:46 2016 -0700
committer Andreas Gampe <agampe@google.com> Tue Mar 22 22:03:46 2016 -0700
tree d0a37a718f5f34ce763ee1ce27f60f2d4b3d3ee5
parent 0197bb59a87583c2363cedd85a72bd401f38338b

ART: Weaken DCHECK

Returns may be either plain or quickened.

Change-Id: Iee343c02fe3e02512c0ed60508525495a7cd5efb

runtime/quick/inline_method_analyser.cc

diff --git a/runtime/quick/inline_method_analyser.cc b/runtime/quick/inline_method_analyser.cc
index c7ccee2..7636f84 100644
--- a/runtime/quick/inline_method_analyser.cc
+++ b/runtime/quick/inline_method_analyser.cc
@@ -320,8 +320,11 @@
         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) {