diff options
| author | 2022-08-11 18:37:07 +0100 | |
|---|---|---|
| committer | 2022-08-13 01:07:46 +0000 | |
| commit | ac9f5e618133532da93c6c1278e7a3ddb1d92b4c (patch) | |
| tree | 7c336e6572641afa962af52004d366cf9c81c6ac /runtime/mirror/string-inl.h | |
| parent | 37da5f30d83b3179f76a86a91873848a45290f85 (diff) | |
OpenJDK 17: java.lang.String (translateEscapes() method)
This is part of merging upstream changes from OpenJDK 17.0.3-ga. This
CL increments vtable_entries count for newly added translateEscapes()
method in String class; and updates test expectations for
100-reflect2 test.
Bug: 242186535
Test: art/test/testrunner/testrunner.py --host -b -t 100-reflect2
Test: atest CtsLibcoreOjTestCases:\
test.java.lang.String.TranslateEscapes
Change-Id: I772c5f8a276581ce99676af0d0e66350cdcbd53f
Diffstat (limited to 'runtime/mirror/string-inl.h')
| -rw-r--r-- | runtime/mirror/string-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/string-inl.h b/runtime/mirror/string-inl.h index da4f8b1901..cbdfef0edf 100644 --- a/runtime/mirror/string-inl.h +++ b/runtime/mirror/string-inl.h @@ -35,9 +35,9 @@ inline uint32_t String::ClassSize(PointerSize pointer_size) { // lambda$codePoints$1$CharSequence // which were virtual functions in standalone desugar, becomes // direct functions with D8 desugaring. - uint32_t vtable_entries = Object::kVTableLength + 62; + uint32_t vtable_entries = Object::kVTableLength + 63; #else - uint32_t vtable_entries = Object::kVTableLength + 64; + uint32_t vtable_entries = Object::kVTableLength + 65; #endif return Class::ComputeClassSize(true, vtable_entries, 0, 0, 0, 1, 2, pointer_size); } |