commit 661425e1f90d4f4ed44c66f5e74f48b92a3798df
author Sebastien Hertz <shertz@google.com> Tue Feb 25 17:08:25 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 25 17:08:26 2014 +0000
tree 18e59994f6799935609c701498bbfd3cef70ce1c
parent 67f8f404a242752651771ab34df18f8eab910cb3
parent aaea7343831b64f4351c9abc7493ec062adfaf53

Merge "Fix debugger disconnection crash."

compiler/dex/mir_optimization.cc

diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc
index b91ef28..67d4769 100644
--- a/compiler/dex/mir_optimization.cc
+++ b/compiler/dex/mir_optimization.cc
@@ -406,7 +406,7 @@
       // Is this the select pattern?
       // TODO: flesh out support for Mips.  NOTE: llvm's select op doesn't quite work here.
       // TUNING: expand to support IF_xx compare & branches
-      if (cu_->compiler_backend->IsPortable() &&
+      if (!cu_->compiler_backend->IsPortable() &&
           (cu_->instruction_set == kThumb2 || cu_->instruction_set == kX86) &&
           ((mir->dalvikInsn.opcode == Instruction::IF_EQZ) ||
           (mir->dalvikInsn.opcode == Instruction::IF_NEZ))) {