From af268bbc4fbd0b9847acf1f7b79c038806118467 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 19 Jun 2015 18:35:41 +0100 Subject: Use IsAssignableFrom instead of IsSubclass for robustness. We can get interface methods as referrer. Instead of crashing, just use IsAssignableFrom. bug:21870666 Change-Id: I7978e36fb981d44611635fbaf3899138bae60672 --- compiler/driver/compiler_driver-inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/driver/compiler_driver-inl.h') diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index e0c56fcc82..09ccd286ee 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -250,7 +250,7 @@ inline bool CompilerDriver::CanAssumeClassIsInitialized(mirror::Class* klass) { inline bool CompilerDriver::CanReferrerAssumeClassIsInitialized(mirror::Class* referrer_class, mirror::Class* klass) { - return (referrer_class != nullptr && referrer_class->IsSubClass(klass)) || + return (referrer_class != nullptr && klass->IsAssignableFrom(referrer_class)) || CanAssumeClassIsInitialized(klass); } -- cgit v1.2.3-59-g8ed1b