diff options
| author | 2023-10-02 09:36:43 +0000 | |
|---|---|---|
| committer | 2023-10-02 10:55:59 +0100 | |
| commit | ee83f167e5041ea43439617e4b5985cad4a34210 (patch) | |
| tree | c3df8ca3f85227428a5f0458bf934942924970b8 /runtime/class_linker.cc | |
| parent | f221e75a1abbddef0bc319062db9953a44a2ada7 (diff) | |
Revert^2 "Use the same cache for MethodType-s created in native and managed code."
This reverts commit 52d0ba769ae791c8eac5160e03de7ad369f07ade and
11b1b75c1b6e15500a10288834e299e673010165.
Reason for revert: aosp/2768053 should break initialisation cycle.
Bug: 297147201
Test: ./art/test/testrunner/testrunner.py --host --64 --optimizing -b
Test: ./art/test/testrunner/testrunner.py --jvm -b
Test: ./art/test.py --host -b
Change-Id: I15b8c1d1014b912ab7e4e9b2adab73736fe2b09b
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 5489c0af6d..2c22a906da 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -1191,8 +1191,9 @@ void ClassLinker::RunRootClinits(Thread* self) { WellKnownClasses::java_lang_reflect_InvocationTargetException_init, // Ensure `Parameter` class is initialized (avoid check at runtime). WellKnownClasses::java_lang_reflect_Parameter_init, - // Ensure `MethodHandles` class is initialized (avoid check at runtime). + // Ensure `MethodHandles` and `MethodType` classes are initialized (avoid check at runtime). WellKnownClasses::java_lang_invoke_MethodHandles_lookup, + WellKnownClasses::java_lang_invoke_MethodType_makeImpl, // Ensure `DirectByteBuffer` class is initialized (avoid check at runtime). WellKnownClasses::java_nio_DirectByteBuffer_init, // Ensure `FloatingDecimal` class is initialized (avoid check at runtime). |