diff options
| author | Andreas Gampe <agampe@google.com> | 2014-07-09 11:38:21 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-07-11 15:53:27 -0700 |
| commit | 22f8e5c82d12951be38cd893426e13bee33fd69d (patch) | |
| tree | f575655ba55315205b7a73f1e02773497913b157 /compiler/oat_writer.h | |
| parent | 946a55fa7aec5058d357b601ac3554e242cd1afa (diff) | |
| download | android_art-22f8e5c82d12951be38cd893426e13bee33fd69d.tar.gz android_art-22f8e5c82d12951be38cd893426e13bee33fd69d.tar.bz2 android_art-22f8e5c82d12951be38cd893426e13bee33fd69d.zip | |
Revert "Revert "ART: Key-Value Store in Oat header""
This reverts commit 452bee5da9811f62123978e142bd67b385e9ff82.
Heap-allocate a couple of objects in dex2oat to avoid large frame
size.
Includes fixes originally in 100596 and 100605.
Change-Id: Id51a44198c973c91f0a3f87b9d992a5dc110c6f8
Diffstat (limited to 'compiler/oat_writer.h')
| -rw-r--r-- | compiler/oat_writer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/oat_writer.h b/compiler/oat_writer.h index dbecb95362..3d34956651 100644 --- a/compiler/oat_writer.h +++ b/compiler/oat_writer.h @@ -79,9 +79,9 @@ class OatWriter { OatWriter(const std::vector<const DexFile*>& dex_files, uint32_t image_file_location_oat_checksum, uintptr_t image_file_location_oat_begin, - const std::string& image_file_location, const CompilerDriver* compiler, - TimingLogger* timings); + TimingLogger* timings, + SafeMap<std::string, std::string>* key_value_store); const OatHeader& GetOatHeader() const { return *oat_header_; @@ -253,9 +253,9 @@ class OatWriter { // dependencies on the image. uint32_t image_file_location_oat_checksum_; uintptr_t image_file_location_oat_begin_; - std::string image_file_location_; // data to write + SafeMap<std::string, std::string>* key_value_store_; OatHeader* oat_header_; std::vector<OatDexFile*> oat_dex_files_; std::vector<OatClass*> oat_classes_; @@ -274,7 +274,7 @@ class OatWriter { uint32_t size_dex_file_alignment_; uint32_t size_executable_offset_alignment_; uint32_t size_oat_header_; - uint32_t size_oat_header_image_file_location_; + uint32_t size_oat_header_key_value_store_; uint32_t size_dex_file_; uint32_t size_interpreter_to_interpreter_bridge_; uint32_t size_interpreter_to_compiled_code_bridge_; |