diff options
author | 2023-01-30 14:29:11 +0000 | |
---|---|---|
committer | 2023-02-01 09:52:45 +0000 | |
commit | 0f6af5e3b51a7f5905d09a98ec8d531541666015 (patch) | |
tree | 7ed720cc521bb7f6e3b092cf6900a34d050c3aba /libartbase/base/safe_map.h | |
parent | d04ed700190056ecd367ee41e6b7f3b87dc7f901 (diff) |
Reland "Write classes in runtime-generated app image."
This reverts commit 24b3d648ff6c2c200003f55ac63fc910d7bfd40f.
Bug: 260557058
Reason for revert:
- Encode class loader context in image, and check it at load time.
- Set nterp entrypoint to methods that can.
Test: test.py
Test: atest com.android.bluetooth.opp.BluetoothOppObexServerSessionTest#onPut_withUnsupportedMimeTypeInHeader_returnsHttpBadRequest
Change-Id: Ibf4a8604c4a226d1acc021103668e211446bb53c
Diffstat (limited to 'libartbase/base/safe_map.h')
-rw-r--r-- | libartbase/base/safe_map.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libartbase/base/safe_map.h b/libartbase/base/safe_map.h index c6d4353038..fa13fe0f68 100644 --- a/libartbase/base/safe_map.h +++ b/libartbase/base/safe_map.h @@ -49,8 +49,9 @@ class SafeMap { SafeMap() = default; SafeMap(const SafeMap&) = default; SafeMap(SafeMap&&) noexcept = default; + explicit SafeMap(const allocator_type& allocator) : map_(allocator) {} explicit SafeMap(const key_compare& cmp, const allocator_type& allocator = allocator_type()) - : map_(cmp, allocator) { + : map_(cmp, allocator) { } Self& operator=(const Self& rhs) { |