Fix wrong assumption on boolean type.

We should not infer that the instruction:
phi(value1, equal(value1, 1))

Is of type boolean. The `equal` could have been a simplification
over a select.

Partial revert of:
https://android-review.googlesource.com/c/platform/art/+/296777

Bug: 123166624
Bug: 134396269
Test: 698-selects
Change-Id: I8c97b17309d6e5b0eeed321d02eb83c96cc07768
diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index 9cc5cad..63c5965 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -754,23 +754,11 @@
   }
 }
 
-static bool CmpHasBoolType(HInstruction* input, HInstruction* cmp) {
-  if (input->GetType() == DataType::Type::kBool) {
-    return true;  // input has direct boolean type
-  } else if (cmp->GetUses().HasExactlyOneElement()) {
-    // Comparison also has boolean type if both its input and the instruction
-    // itself feed into the same phi node.
-    HInstruction* user = cmp->GetUses().front().GetUser();
-    return user->IsPhi() && user->HasInput(input) && user->HasInput(cmp);
-  }
-  return false;
-}
-
 void InstructionSimplifierVisitor::VisitEqual(HEqual* equal) {
   HInstruction* input_const = equal->GetConstantRight();
   if (input_const != nullptr) {
     HInstruction* input_value = equal->GetLeastConstantLeft();
-    if (CmpHasBoolType(input_value, equal) && input_const->IsIntConstant()) {
+    if ((input_value->GetType() == DataType::Type::kBool) && input_const->IsIntConstant()) {
       HBasicBlock* block = equal->GetBlock();
       // We are comparing the boolean to a constant which is of type int and can
       // be any constant.
@@ -802,7 +790,7 @@
   HInstruction* input_const = not_equal->GetConstantRight();
   if (input_const != nullptr) {
     HInstruction* input_value = not_equal->GetLeastConstantLeft();
-    if (CmpHasBoolType(input_value, not_equal) && input_const->IsIntConstant()) {
+    if ((input_value->GetType() == DataType::Type::kBool) && input_const->IsIntConstant()) {
       HBasicBlock* block = not_equal->GetBlock();
       // We are comparing the boolean to a constant which is of type int and can
       // be any constant.
diff --git a/test/698-selects/expected.txt b/test/698-selects/expected.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/698-selects/expected.txt
diff --git a/test/698-selects/info.txt b/test/698-selects/info.txt
new file mode 100644
index 0000000..7f2a090
--- /dev/null
+++ b/test/698-selects/info.txt
@@ -0,0 +1,2 @@
+Regression test for the compiler, which used to have wrong
+assumptions on what could be of a boolean type.
diff --git a/test/698-selects/src/Main.java b/test/698-selects/src/Main.java
new file mode 100644
index 0000000..1fadb86
--- /dev/null
+++ b/test/698-selects/src/Main.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class Main {
+  public static int mZenMode = 0;
+
+  public static int $noinline$foo(int internal, boolean check1, boolean check2) {
+    int result = internal;
+    if (check1) {
+      // This block is to ensure `result` is a phi in the return block. Without this block
+      // the compiler could just generate one block with selects.
+      if (check2) {
+        mZenMode = 42;
+      }
+      result = (internal == 1) ? 1 : 0;
+    }
+    // The optimization bug was to make the incorrect assumption that:
+    //    phi = (internal, (internal == 1))
+    // meant `internal` was a boolean.
+    return result;
+  }
+
+  public static void main(String[] args) {
+    int result = $noinline$foo(2, true, true);
+    if (result != 0) {
+      throw new Error("Expected 0, got " + result);
+    }
+  }
+}