ART: Loosen a GraphChecker rule on Boolean inputs

GraphChecker tries to verify that Boolean inputs are properly typed.
This is non-trivial in the presence of simplifying optimizations
which capitalize on the fact that a Boolean value is internally
represented as an integer.

This patch removes the test from GraphChecker.

Bug: 27625564
Change-Id: Ic61ea2193765b4578550538e965ca4f80fa4b287

6 files changed, 124 insertions, 10 deletions

diff --git a/compiler/optimizing/graph_checker.cc b/compiler/optimizing/graph_checker.cc
index 528fe44669..e5c8c47579 100644
--- a/compiler/optimizing/graph_checker.cc
+++ b/compiler/optimizing/graph_checker.cc
@@ -840,17 +840,11 @@ void GraphChecker::HandleBooleanInput(HInstruction* instruction, size_t input_in
           static_cast<int>(input_index),
           value));
     }
-  } else if (input->GetType() == Primitive::kPrimInt
-             && (input->IsPhi() ||
-                 input->IsAnd() ||
-                 input->IsOr() ||
-                 input->IsXor() ||
-                 input->IsSelect())) {
-    // TODO: We need a data-flow analysis to determine if the Phi or Select or
-    //       binary operation is actually Boolean. Allow for now.
-  } else if (input->GetType() != Primitive::kPrimBoolean) {
+  } else if (Primitive::PrimitiveKind(input->GetType()) != Primitive::kPrimInt) {
+    // TODO: We need a data-flow analysis to determine if an input like Phi,
+    //       Select or a binary operation is actually Boolean. Allow for now.
     AddError(StringPrintf(
-        "%s instruction %d has a non-Boolean input %d whose type is: %s.",
+        "%s instruction %d has a non-integer input %d whose type is: %s.",
         instruction->DebugName(),
         instruction->GetId(),
         static_cast<int>(input_index),
diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc
index 3a9d242df2..4b5b919b68 100644
--- a/compiler/optimizing/graph_visualizer.cc
+++ b/compiler/optimizing/graph_visualizer.cc
@@ -418,6 +418,20 @@ class HGraphVisualizerPrinter : public HGraphDelegateVisitor {
     StartAttributeStream("intrinsic") << invoke->GetIntrinsic();
   }
 
+  void VisitInstanceFieldGet(HInstanceFieldGet* iget) OVERRIDE {
+    StartAttributeStream("field_name") << PrettyField(iget->GetFieldInfo().GetFieldIndex(),
+                                                      iget->GetFieldInfo().GetDexFile(),
+                                                      /* with type */ false);
+    StartAttributeStream("field_type") << iget->GetFieldType();
+  }
+
+  void VisitInstanceFieldSet(HInstanceFieldSet* iset) OVERRIDE {
+    StartAttributeStream("field_name") << PrettyField(iset->GetFieldInfo().GetFieldIndex(),
+                                                      iset->GetFieldInfo().GetDexFile(),
+                                                      /* with type */ false);
+    StartAttributeStream("field_type") << iset->GetFieldType();
+  }
+
   void VisitUnresolvedInstanceFieldGet(HUnresolvedInstanceFieldGet* field_access) OVERRIDE {
     StartAttributeStream("field_type") << field_access->GetFieldType();
   }
diff --git a/test/592-checker-regression-bool-input/expected.txt b/test/592-checker-regression-bool-input/expected.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/592-checker-regression-bool-input/expected.txt
diff --git a/test/592-checker-regression-bool-input/info.txt b/test/592-checker-regression-bool-input/info.txt
new file mode 100644
index 0000000000..8b97d9d973
--- /dev/null
+++ b/test/592-checker-regression-bool-input/info.txt
@@ -0,0 +1,2 @@
+Regression test for Optimizing's GraphChecker which used to verify the internal
+type of a boolean input.
\ No newline at end of file
diff --git a/test/592-checker-regression-bool-input/smali/TestCase.smali b/test/592-checker-regression-bool-input/smali/TestCase.smali
new file mode 100644
index 0000000000..56c499d4b6
--- /dev/null
+++ b/test/592-checker-regression-bool-input/smali/TestCase.smali
@@ -0,0 +1,42 @@
+# Copyright (C) 2016 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.
+
+.class public LTestCase;
+
+.super Ljava/lang/Object;
+
+## CHECK-START: boolean TestCase.testCase() load_store_elimination (after)
+## CHECK-DAG:     If [{{b\d+}}]
+
+.method public static testCase()Z
+    .registers 6
+
+    sget-boolean v0, LMain;->field0:Z
+    sget-boolean v1, LMain;->field1:Z
+    or-int v2, v0, v1
+    int-to-byte v2, v2
+    sput-boolean v2, LMain;->field2:Z
+
+    # LSE will replace this sget with the type conversion above...
+    sget-boolean v2, LMain;->field2:Z
+
+    # ... and generate an If with a byte-typed condition.
+    if-eqz v2, :else
+    const v0, 0x1
+    return v0
+
+    :else
+    const v0, 0x0
+    return v0
+.end method
diff --git a/test/592-checker-regression-bool-input/src/Main.java b/test/592-checker-regression-bool-input/src/Main.java
new file mode 100644
index 0000000000..7b593f4444
--- /dev/null
+++ b/test/592-checker-regression-bool-input/src/Main.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+
+public class Main {
+  // Workaround for b/18051191.
+  class Inner {}
+
+  public static boolean field0;
+  public static boolean field1;
+  public static boolean field2;
+
+  public static void assertTrue(boolean result) {
+    if (!result) {
+      throw new Error("Expected true");
+    }
+  }
+
+  public static void assertFalse(boolean result) {
+    if (result) {
+      throw new Error("Expected false");
+    }
+  }
+
+  public static void main(String[] args) throws Throwable {
+    System.loadLibrary(args[0]);
+    Class<?> c = Class.forName("TestCase");
+    Method m = c.getMethod("testCase");
+
+    try {
+      field0 = true;
+      field1 = false;
+      assertTrue((Boolean) m.invoke(null, null));
+
+      field0 = true;
+      field1 = true;
+      assertTrue((Boolean) m.invoke(null, null));
+
+      field0 = false;
+      field1 = false;
+      assertFalse((Boolean) m.invoke(null, null));
+    } catch (Exception e) {
+      throw new Error(e);
+    }
+  }
+}