Merge "Fix bug in optimizing around instanceof."

1 files changed, 3 insertions, 1 deletions

diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index 98a5841f80..2daeeb3c0c 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -206,7 +206,9 @@ static bool TypeCheckHasKnownOutcome(HLoadClass* klass, HInstruction* object, bo
     // The test failed at compile time so will also fail at runtime.
     *outcome = false;
     return true;
-  } else if (!class_rti.IsInterface() && !obj_rti.IsSupertypeOf(class_rti)) {
+  } else if (!class_rti.IsInterface()
+             && !obj_rti.IsInterface()
+             && !obj_rti.IsSupertypeOf(class_rti)) {
     // Different type hierarchy. The test will fail.
     *outcome = false;
     return true;