From 463580ca5a1e75e27ad0207537ffc6252091326a Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 22 Jun 2015 10:04:29 +0000 Subject: Revert "Use IsAssignableFrom instead of IsSubclass for robustness." Not correct for Quick. Bug:21870666 This reverts commit af268bbc4fbd0b9847acf1f7b79c038806118467. Change-Id: Id44849cc877a42495619fd71bfd2db75159b6868 --- compiler/optimizing/builder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/optimizing/builder.cc') diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 501a1dd72c..b568f31a57 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. -- cgit v1.2.3-59-g8ed1b