commit 654698dddfd1f4d9ec0db477f4f9592d58dff039
author Andreas Gampe <agampe@google.com> Thu Sep 20 13:34:35 2018 -0700
committer Andreas Gampe <agampe@google.com> Thu Sep 20 20:32:41 2018 -0700
tree 03181d1b4fada0ec4e71156df1063331297053bc
parent c74d9cbd4c7b1b5b1a4c5a6bb34e9426336bbecc

ART: Fix bool-related types in compiler/

Avoid implicit bool conversions.

Bug: 32619234
Test: WITH_TIDY=1 mmma art
Change-Id: I364de41302f379e84980f720b2be99388a74dce2

compiler/optimizing/instruction_simplifier.cc

diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index 7ee5ad0..ad50bb8 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -1317,7 +1317,7 @@
   }
 
   HNeg* neg = left_is_neg ? left->AsNeg() : right->AsNeg();
-  if ((left_is_neg ^ right_is_neg) && neg->HasOnlyOneNonEnvironmentUse()) {
+  if (left_is_neg != right_is_neg && neg->HasOnlyOneNonEnvironmentUse()) {
     // Replace code looking like
     //    NEG tmp, b
     //    ADD dst, a, tmp

compiler/optimizing/register_allocator_test.cc

diff --git a/compiler/optimizing/register_allocator_test.cc b/compiler/optimizing/register_allocator_test.cc
index db6a760..be5304c 100644
--- a/compiler/optimizing/register_allocator_test.cc
+++ b/compiler/optimizing/register_allocator_test.cc
@@ -872,9 +872,9 @@
   // Create an interval with lifetime holes.
   static constexpr size_t ranges1[][2] = {{0, 2}, {4, 6}, {8, 10}};
   LiveInterval* first = BuildInterval(ranges1, arraysize(ranges1), GetScopedAllocator(), -1, one);
-  first->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, false, 8));
-  first->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, false, 7));
-  first->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, false, 6));
+  first->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, 0u, 8));
+  first->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, 0u, 7));
+  first->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, 0u, 6));
 
   locations = new (GetAllocator()) LocationSummary(first->GetDefinedBy(), LocationSummary::kNoCall);
   locations->SetOut(Location::RequiresRegister());
@@ -895,9 +895,9 @@
   // before lifetime position 6 yet.
   static constexpr size_t ranges3[][2] = {{2, 4}, {8, 10}};
   LiveInterval* third = BuildInterval(ranges3, arraysize(ranges3), GetScopedAllocator(), -1, three);
-  third->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, false, 8));
-  third->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, false, 4));
-  third->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, false, 3));
+  third->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, 0u, 8));
+  third->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, 0u, 4));
+  third->uses_.push_front(*new (GetScopedAllocator()) UsePosition(user, 0u, 3));
   locations = new (GetAllocator()) LocationSummary(third->GetDefinedBy(), LocationSummary::kNoCall);
   locations->SetOut(Location::RequiresRegister());
   third = third->SplitAt(3);