commit 12abcbd950bd0ff4528e2e0d27ca5e881c7b0467
author Nicolas Geoffray <ngeoffray@google.com> Mon Jun 06 15:51:58 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Jun 06 15:51:58 2016 +0000
tree 2788e5aec7b022694f7e7d41c1e40c205e46596e
parent 808067335b228d7b50ad84123d3c8ecb7aeeb200

Revert "Fix ArtMethod::GetInvokeType for static methods on interfaces."

bug:29089267
bug:27521545

Fails some DHECKs.

This reverts commit 808067335b228d7b50ad84123d3c8ecb7aeeb200.

Change-Id: I0e768ce85be593e3f50fd02abc29aa34f2be3562

runtime/art_method.cc

diff --git a/runtime/art_method.cc b/runtime/art_method.cc
index f86cb13..1790df6 100644
--- a/runtime/art_method.cc
+++ b/runtime/art_method.cc
@@ -79,10 +79,10 @@
 
 InvokeType ArtMethod::GetInvokeType() {
   // TODO: kSuper?
-  if (IsStatic()) {
-    return kStatic;
-  } else if (GetDeclaringClass()->IsInterface()) {
+  if (GetDeclaringClass()->IsInterface()) {
     return kInterface;
+  } else if (IsStatic()) {
+    return kStatic;
   } else if (IsDirect()) {
     return kDirect;
   } else {