commit 5d4430b94446ea303327a311ad153767ed689863
author Andreas Gampe <agampe@google.com> Tue Mar 31 16:14:13 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 31 16:14:14 2015 +0000
tree 727f76a269b72e81bd52b3e4f77e6007620d9cf1
parent 2910e15a5c67821c935e310ca51772d82095def2
parent 42514f63aadfa9faec3718874db2108f3e89082d

Merge "[optimizing] trivial x86 explicit null check fix"

compiler/optimizing/code_generator_x86.cc

diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 8d0ca0b..0d5fe49 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -3146,7 +3146,7 @@
   Location obj = locations->InAt(0);
 
   if (obj.IsRegister()) {
-    __ cmpl(obj.AsRegister<Register>(), Immediate(0));
+    __ testl(obj.AsRegister<Register>(), obj.AsRegister<Register>());
   } else if (obj.IsStackSlot()) {
     __ cmpl(Address(ESP, obj.GetStackIndex()), Immediate(0));
   } else {