diff options
| author | 2016-10-03 08:46:48 +0000 | |
|---|---|---|
| committer | 2016-10-04 17:51:46 +0100 | |
| commit | aad75c6d5bfab2dc8e30fc99fafe8cd2dc8b74d8 (patch) | |
| tree | c1b9e1eabcf35c5cbb5b4f46313a4e062f2d5d51 /compiler/image_test.cc | |
| parent | 82d4838d6bb3480cd25327cedc5179fb2d86881c (diff) | |
Revert "Revert "Store resolved Strings for AOT code in .bss.""
Fixed oat_test to keep dex files alive. Fixed mips build.
Rewritten the .bss GC root visiting and added write barrier
to the artResolveStringFromCode().
Test: build aosp_mips-eng
Test: m ART_DEFAULT_GC_TYPE=SS test-art-target-host-gtest-oat_test
Test: Run ART test suite on host and Nexus 9.
Bug: 20323084
Bug: 30627598
This reverts commit 5f926055cb88089d8ca27243f35a9dfd89d981f0.
Change-Id: I07fa2278d82b8eb64964c9a4b66cb93726ccda6b
Diffstat (limited to 'compiler/image_test.cc')
| -rw-r--r-- | compiler/image_test.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/image_test.cc b/compiler/image_test.cc index 4689c9d300..9e94b9d861 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -263,7 +263,10 @@ void CompilationHelper::Compile(CompilerDriver* driver, oat_writer->PrepareLayout(driver, writer.get(), cur_dex_files, &patcher); size_t rodata_size = oat_writer->GetOatHeader().GetExecutableOffset(); size_t text_size = oat_writer->GetOatSize() - rodata_size; - elf_writer->SetLoadedSectionSizes(rodata_size, text_size, oat_writer->GetBssSize()); + elf_writer->PrepareDynamicSection(rodata_size, + text_size, + oat_writer->GetBssSize(), + oat_writer->GetBssRootsOffset()); writer->UpdateOatFileLayout(i, elf_writer->GetLoadedSize(), |