Merge "Do a type check for knowing if we can inline."
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index ea613b2..07d0dd6 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -120,6 +120,9 @@
// Statically knowing that the receiver has an interface type cannot
// help us find what is the target method.
return nullptr;
+ } else if (!resolved_method->GetDeclaringClass()->IsAssignableFrom(info.GetTypeHandle().Get())) {
+ // The method that we're trying to call is not in the receiver's class or super classes.
+ return nullptr;
}
ClassLinker* cl = Runtime::Current()->GetClassLinker();