commit d7cbf8a6629942e7bd315ffae7e1c77b082f3e11
author Mathieu Chartier <mathieuc@google.com> Thu Mar 19 12:43:20 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Mar 19 20:00:50 2015 -0700
tree fc8c3371ed4ddac96bbe90a2f94ef5fb5c5472ee
parent f5988cf0c47ff935bb19c89ed0398be5fbe44bb6

Change RETURN_VOID_BARRIER to RETURN_VOID_NO_BARRIER

We want to default to having a barrier for the case where we don't
dex to dex.

Bug: 19762303
Change-Id: I60348d89eaf0b9e1e480298afcecbb5f52e8661b

compiler/dex/quick/mir_to_lir.cc

diff --git a/compiler/dex/quick/mir_to_lir.cc b/compiler/dex/quick/mir_to_lir.cc
index 8edc5fc..8fc45dc 100644
--- a/compiler/dex/quick/mir_to_lir.cc
+++ b/compiler/dex/quick/mir_to_lir.cc
@@ -540,7 +540,7 @@
       GenMoveException(rl_dest);
       break;
 
-    case Instruction::RETURN_VOID_BARRIER:
+    case Instruction::RETURN_VOID_NO_BARRIER:
     case Instruction::RETURN_VOID:
       if (((cu_->access_flags & kAccConstructor) != 0) &&
           cu_->compiler_driver->RequiresConstructorBarrier(Thread::Current(), cu_->dex_file,