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/mir_dataflow.cc

diff --git a/compiler/dex/mir_dataflow.cc b/compiler/dex/mir_dataflow.cc
index dfaff6c..f638b0b 100644
--- a/compiler/dex/mir_dataflow.cc
+++ b/compiler/dex/mir_dataflow.cc
@@ -374,7 +374,7 @@
   // 72 INVOKE_INTERFACE {vD, vE, vF, vG, vA}
   DF_FORMAT_35C | DF_NULL_CHK_OUT0 | DF_UMS,
 
-  // 73 RETURN_VOID_BARRIER
+  // 73 RETURN_VOID_NO_BARRIER
   DF_NOP,
 
   // 74 INVOKE_VIRTUAL_RANGE {vCCCC .. vNNNN}