From 9c4b970db31b234d6c0358802cd14ba4262e4ce6 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 14 Nov 2018 15:09:02 +0000 Subject: Rewrite image type in CompilerOptions. Prepare for introduction of boot image extension. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Test: Pixel 2 XL boots. Change-Id: Id007c4aeb4ada84fe65c1148fdf67e8a412e5b74 --- compiler/driver/compiler_options.h | 17 +++++++++-------- 1 file changed, 9 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 2f4e5428ea..12fa251606 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -58,6 +58,12 @@ class CompilerOptions final { static const size_t kDefaultInlineMaxCodeUnits = 32; static constexpr size_t kUnsetInlineMaxCodeUnits = -1; + enum class ImageType : uint8_t { + kNone, // JIT or AOT app compilation producing only an oat file but no image. + kBootImage, // Creating boot image. + kAppImage, // Creating app image. + }; + CompilerOptions(); ~CompilerOptions(); @@ -191,7 +197,7 @@ class CompilerOptions final { // Are we compiling a boot image? bool IsBootImage() const { - return boot_image_; + return image_type_ == ImageType::kBootImage; } bool IsBaseline() const { @@ -200,11 +206,7 @@ class CompilerOptions final { // Are we compiling an app image? bool IsAppImage() const { - return app_image_; - } - - void DisableAppImage() { - app_image_ = false; + return image_type_ == ImageType::kAppImage; } // Returns whether we are compiling against a "core" image, which @@ -356,8 +358,7 @@ class CompilerOptions final { // Must not be empty for real boot image, only for tests pretending to compile boot image. HashSet image_classes_; - bool boot_image_; - bool app_image_; + ImageType image_type_; bool compiling_with_core_image_; bool baseline_; bool debuggable_; -- cgit v1.2.3-59-g8ed1b