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.