From 6be1dbd3bc34b2cfa0fe257acbea273f1b6f4a53 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 13 Nov 2018 13:09:51 +0000 Subject: ART: Rewrite core image detection. Remove unused compiler option `core_image_` and cache the IsCompilingWithCoreImage in the CompilerOptions instead. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Change-Id: Idcf3b6c96dab9a39f823a16778e7698589442cd8 --- compiler/driver/compiler_options.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'compiler/driver/compiler_options.h') diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index 77f84820e5..2f4e5428ea 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -198,13 +198,6 @@ class CompilerOptions final { return baseline_; } - // Are we compiling a core image (small boot image only used for ART testing)? - bool IsCoreImage() const { - // Ensure that `core_image_` => `boot_image_`. - DCHECK(!core_image_ || boot_image_); - return core_image_; - } - // Are we compiling an app image? bool IsAppImage() const { return app_image_; @@ -214,6 +207,13 @@ class CompilerOptions final { app_image_ = false; } + // Returns whether we are compiling against a "core" image, which + // is an indicative we are running tests. The compiler will use that + // information for checking invariants. + bool CompilingWithCoreImage() const { + return compiling_with_core_image_; + } + // Should the code be compiled as position independent? bool GetCompilePic() const { return compile_pic_; @@ -357,8 +357,8 @@ class CompilerOptions final { HashSet image_classes_; bool boot_image_; - bool core_image_; bool app_image_; + bool compiling_with_core_image_; bool baseline_; bool debuggable_; bool generate_debug_info_; -- cgit v1.2.3-59-g8ed1b