commit 5b1805357b80d780d6afc9e2c70c6544c7ac7e2f
author Vladimir Marko <vmarko@google.com> Tue Mar 15 18:11:50 2016 +0000
committer Vladimir Marko <vmarko@google.com> Tue Mar 15 18:11:50 2016 +0000
tree 696a474d54a35b974d51cefff24d961f98e57e7b
parent 12af36e09116dc677820f98e33ff2982e07d652a

ART: Fix shift simplification, x >>> 64.

Fix braino in
    https://android-review.googlesource.com/208199

Bug: 27638111
Change-Id: I8f12008af8bba943664c8a9eac3f2d2f7c820e79

compiler/optimizing/instruction_simplifier.cc

diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index f1f4652..9cfc16f 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -237,7 +237,7 @@
   if (input_cst != nullptr) {
     int64_t cst = Int64FromConstant(input_cst);
     int64_t mask =
-        (input_cst->GetType() == Primitive::kPrimLong) ? kMaxLongShiftValue : kMaxIntShiftValue;
+        (input_other->GetType() == Primitive::kPrimLong) ? kMaxLongShiftValue : kMaxIntShiftValue;
     if ((cst & mask) == 0) {
       // Replace code looking like
       //    SHL dst, src, 0