commit 08794a9481dec1da98f1a0c668c6dab3907b342a
author Serguei Katkov <serguei.i.katkov@intel.com> Thu Nov 06 13:56:13 2014 +0600
committer Serguei Katkov <serguei.i.katkov@intel.com> Tue Nov 11 11:43:37 2014 +0600
tree 62a15d7f6f9e43e9bbac0ea744e82127d0541716
parent fa7ec00ae4f9f8b1c8e1ad809155cfa675a0121d

Fix CombineBlocks optimization

(df_attributes & DF_DA) means Get not Put.
The patch fixes the condition to eliminate catch block for
get/put operations.

Change-Id: I48036f3614de5116e27c0d6e9a7a342432c9a828
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>

compiler/dex/mir_optimization.cc

diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc
index b35d51c..a0ad213 100644
--- a/compiler/dex/mir_optimization.cc
+++ b/compiler/dex/mir_optimization.cc
@@ -771,11 +771,11 @@
     if ((df_attributes & DF_IFIELD) != 0) {
       // Combine only if fast, otherwise weird things can happen.
       const MirIFieldLoweringInfo& field_info = GetIFieldLoweringInfo(throw_insn);
-      ok = (df_attributes & DF_DA)  ? field_info.FastPut() : field_info.FastGet();
+      ok = (df_attributes & DF_DA)  ? field_info.FastGet() : field_info.FastPut();
     } else if ((df_attributes & DF_SFIELD) != 0) {
       // Combine only if fast, otherwise weird things can happen.
       const MirSFieldLoweringInfo& field_info = GetSFieldLoweringInfo(throw_insn);
-      bool fast = ((df_attributes & DF_DA)  ? field_info.FastPut() : field_info.FastGet());
+      bool fast = ((df_attributes & DF_DA)  ? field_info.FastGet() : field_info.FastPut());
       // Don't combine if the SGET/SPUT can call <clinit>().
       bool clinit = !field_info.IsClassInitialized() &&
           (throw_insn->optimization_flags & MIR_CLASS_IS_INITIALIZED) == 0;