From aad75c6d5bfab2dc8e30fc99fafe8cd2dc8b74d8 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 3 Oct 2016 08:46:48 +0000 Subject: 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 --- compiler/driver/compiler_options.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'compiler/driver/compiler_options.h') diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index abc58d7dda..8e4a775558 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -203,6 +203,14 @@ class CompilerOptions FINAL { return include_patch_information_; } + bool IsBootImage() const { + return boot_image_; + } + + bool IsAppImage() const { + return app_image_; + } + // Should the code be compiled as position independent? bool GetCompilePic() const { return compile_pic_; @@ -281,6 +289,8 @@ class CompilerOptions FINAL { // prefer vector<> over a lookup-oriented container, such as set<>. const std::vector* no_inline_from_; + bool boot_image_; + bool app_image_; bool include_patch_information_; // When using a profile file only the top K% of the profiled samples will be compiled. double top_k_profile_threshold_; @@ -305,7 +315,7 @@ class CompilerOptions FINAL { std::string dump_cfg_file_name_; bool dump_cfg_append_; - // Whether the compiler should trade performance for determinism to guarantee exactly reproducable + // Whether the compiler should trade performance for determinism to guarantee exactly reproducible // outcomes. bool force_determinism_; @@ -320,6 +330,7 @@ class CompilerOptions FINAL { const std::vector* passes_to_run_; friend class Dex2Oat; + friend class CommonCompilerTest; DISALLOW_COPY_AND_ASSIGN(CompilerOptions); }; -- cgit v1.2.3-59-g8ed1b