diff options
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 268b9822ac..3c69323b20 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -4265,14 +4265,10 @@ void ClassLinker::CreateProxyMethod(Handle<mirror::Class> klass, ArtMethod* prot DCHECK(out != nullptr); out->CopyFrom(prototype, image_pointer_size_); - // Set class to be the concrete proxy class. + // Set class to be the concrete proxy class and clear the abstract flag, modify exceptions to + // the intersection of throw exceptions as defined in Proxy out->SetDeclaringClass(klass.Get()); - // Clear the abstract, default and conflict flags to ensure that defaults aren't picked in - // preference to the invocation handler. - const uint32_t kRemoveFlags = kAccAbstract | kAccDefault | kAccDefaultConflict; - // Make the method final. - const uint32_t kAddFlags = kAccFinal; - out->SetAccessFlags((out->GetAccessFlags() & ~kRemoveFlags) | kAddFlags); + out->SetAccessFlags((out->GetAccessFlags() & ~kAccAbstract) | kAccFinal); // At runtime the method looks like a reference and argument saving method, clone the code // related parameters from this method. |