commit d5a8695394f8f6e8f9a66752441623dc31b97660
author Nicolas Geoffray <ngeoffray@google.com> Tue Jan 19 10:35:54 2021 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Jan 21 14:07:57 2021 +0000
tree 591ac4892304365282a57262c91e1945ac94c6a9
parent 2fb37411e42455a00fdad90f0e612c3214e5bd1a

Reland "Improve invokeinterface for nterp."

This reverts commit f1d06474baa2f7c00761db39099b89ddab71bbe4.

Bug: 177554973
Bug: 112676029

Test: test.py
Test: 815-invokeinterface-default
Test: enable text-to-speech on device, no crash

Reason for revert: Fixed issue with recursive default methods

Change-Id: I2fb9336adb6c4fc920f39aa19bfe7f0a92ce059a

runtime/entrypoints/quick/quick_trampoline_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index 197e8ef..49dfba6 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -2447,6 +2447,7 @@
   DCHECK(!interface_method->GetDeclaringClass()->IsObjectClass());
   DCHECK(interface_method->GetDeclaringClass()->IsInterface());
   DCHECK(!interface_method->IsRuntimeMethod());
+  DCHECK(!interface_method->IsCopied());
 
   ObjPtr<mirror::Object> obj_this = raw_this_object;
   ObjPtr<mirror::Class> cls = obj_this->GetClass();