diff options
| author | 2016-03-16 23:00:49 +0000 | |
|---|---|---|
| committer | 2016-03-16 23:00:49 +0000 | |
| commit | daf58c80d42f024aae0cb94ebd2c0bd61ebbf240 (patch) | |
| tree | 66f378cf59ddee476981de4828461f62bceafa9f /runtime/interpreter/interpreter_common.cc | |
| parent | ec3b7ab8f008f36f1072d4ba03da204229b95976 (diff) | |
Revert "Fix issue with proxy invocation on default methods"
This reverts commit ec3b7ab8f008f36f1072d4ba03da204229b95976.
Change-Id: Idfb2c63c246cc5dae7670503e70ad3f62bb1e1eb
Diffstat (limited to 'runtime/interpreter/interpreter_common.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_common.cc | 6 |
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; |