OSDN Git Service

Collapse ART's AbstractMethod class into Executable
authorNeil Fuller <nfuller@google.com>
Thu, 8 Sep 2016 12:43:31 +0000 (13:43 +0100)
committerNeil Fuller <nfuller@google.com>
Wed, 21 Sep 2016 10:42:21 +0000 (11:42 +0100)
commit0e8443995af602bcc2e70dcef1d20ee48acec934
tree2d81b8db23bea139e40e33e4e9b8c69027fb1e56
parentc4cb3d532db8a500c1a15e8a0052895960259209
Collapse ART's AbstractMethod class into Executable

After the OpenJDK 8 pull there is now a common base class
for Method and Constructor that can be used instead.

Methods that are abstract on Executable but on Android
were implemented in AbstractMethod are now consistently
renamed to "{method}Internal", declared final and
given package-protected access.

For consistency with all other private, natively
implemented methods, the method getDeclaredAnnotations()
has been renamed getDeclaredAnnotationsNative().

Bug: 28666126
Bug: 31052885
Test: make test-art-host and cts run of CtsLibcoreTestCases
Change-Id: Ibfe6af6a47fe0cfffd0859ffbe58980aeb84e053
20 files changed:
compiler/dex/dex_to_dex_compiler.cc
compiler/image_writer.cc
patchoat/patchoat.cc
runtime/Android.bp
runtime/art_method.cc
runtime/class_linker_test.cc
runtime/jni_internal.cc
runtime/mirror/abstract_method.h [deleted file]
runtime/mirror/executable.cc [moved from runtime/mirror/abstract_method.cc with 71% similarity]
runtime/mirror/executable.h
runtime/mirror/method.cc
runtime/mirror/method.h
runtime/native/java_lang_reflect_Executable.cc [moved from runtime/native/java_lang_reflect_AbstractMethod.cc with 78% similarity]
runtime/native/java_lang_reflect_Executable.h [moved from runtime/native/java_lang_reflect_AbstractMethod.h with 72% similarity]
runtime/reflection.cc
runtime/runtime.cc
runtime/verifier/method_verifier.cc
runtime/well_known_classes.cc
runtime/well_known_classes.h
test/031-class-attributes/src/ClassAttrs.java