diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/driver/compiler_driver-inl.h | 2 | ||||
| -rw-r--r-- | compiler/optimizing/builder.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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); } diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index ffa4cc328d..3960a26e92 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -697,7 +697,7 @@ bool HGraphBuilder::BuildInvoke(const Instruction& instruction, &storage_index); } - if (referrer_class.Get()->IsSubClass(resolved_method->GetDeclaringClass())) { + if (resolved_method->GetDeclaringClass()->IsAssignableFrom(referrer_class.Get())) { // If the referrer class is the declaring class or a subclass // of the declaring class, no class initialization is needed // before the static method call. |