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
diff --git a/compiler/optimizing/graph_checker.cc b/compiler/optimizing/graph_checker.cc
index 528fe44..e5c8c47 100644
--- a/compiler/optimizing/graph_checker.cc
+++ b/compiler/optimizing/graph_checker.cc
@@ -840,17 +840,11 @@
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 3a9d242..4b5b919 100644
--- a/compiler/optimizing/graph_visualizer.cc
+++ b/compiler/optimizing/graph_visualizer.cc
@@ -418,6 +418,20 @@
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();
}