diff options
| author | 2015-06-22 13:47:02 +0000 | |
|---|---|---|
| committer | 2015-06-22 13:47:02 +0000 | |
| commit | 2d655f1ce89a714094a4f55ac75edcf9a34c7e24 (patch) | |
| tree | c6046874de725b77a8744637f470ade1861fa7c7 /compiler/optimizing/builder.cc | |
| parent | a63d8f44740a8406adda6aaff7ed75ef923c085f (diff) | |
| parent | b783b408112d1797da646f576a40f94bcb5162f3 (diff) | |
Merge "Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness."""
Diffstat (limited to 'compiler/optimizing/builder.cc')
| -rw-r--r-- | compiler/optimizing/builder.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 07366936bf..c49752642b 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -697,7 +697,8 @@ bool HGraphBuilder::BuildInvoke(const Instruction& instruction, &storage_index); } - if (outer_class.Get()->IsSubClass(resolved_method->GetDeclaringClass())) { + if (!outer_class->IsInterface() + && outer_class->IsSubClass(resolved_method->GetDeclaringClass())) { // If the outer class is the declaring class or a subclass // of the declaring class, no class initialization is needed // before the static method call. |