Merge "Revert "Fix issue with proxy invocation on default methods""

1 files changed, 2 insertions, 4 deletions

diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index 310e211aaf..3453abcd64 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -555,10 +555,8 @@ static inline bool DoCallCommon(ArtMethod* called_method,
     string_init = true;
   }
 
-  // Compute method information. Need to specifically check for proxy methods since default-method
-  // proxies might have a CodeItem from the default version.
-  const DexFile::CodeItem* code_item =
-      called_method->IsProxyMethod() ? nullptr : called_method->GetCodeItem();
+  // Compute method information.
+  const DexFile::CodeItem* code_item = called_method->GetCodeItem();
 
   // Number of registers for the callee's call frame.
   uint16_t num_regs;