diff options
| author | 2015-06-22 10:05:58 +0000 | |
|---|---|---|
| committer | 2015-06-22 10:05:59 +0000 | |
| commit | 0f0be7261c68ebb701677b70d40e373accef4d09 (patch) | |
| tree | 6ea3fd862cfe430b3c1e2ebcdcdbd69936e0ff26 /compiler/optimizing/builder.cc | |
| parent | e85647ed00d07169193cc07ffa09e3b70ce38f59 (diff) | |
| parent | 463580ca5a1e75e27ad0207537ffc6252091326a (diff) | |
Merge "Revert "Use IsAssignableFrom instead of IsSubclass for robustness.""
Diffstat (limited to 'compiler/optimizing/builder.cc')
| -rw-r--r-- | compiler/optimizing/builder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 3960a26e92..ffa4cc328d 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -697,7 +697,7 @@ bool HGraphBuilder::BuildInvoke(const Instruction& instruction, &storage_index); } - if (resolved_method->GetDeclaringClass()->IsAssignableFrom(referrer_class.Get())) { + if (referrer_class.Get()->IsSubClass(resolved_method->GetDeclaringClass())) { // 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. |