From ada8536c19e57cbfe55dcb3c72aa95e79365ed21 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 20 Feb 2020 14:17:39 +0000 Subject: If generating an image, run initialization and other optimizations. The biggest reason for this CL is to ensure a boot image and a boot image extension always have their conflict tables filled. Test: test.py Bug: 149894949 Change-Id: I7bada1b3697322ce78b4f352dec854651c0e995c --- compiler/driver/compiler_options.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'compiler/driver/compiler_options.h') diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index 747205e4e5..79ba1c27c9 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -195,6 +195,10 @@ class CompilerOptions final { return implicit_suspend_checks_; } + bool IsGeneratingImage() const { + return IsBootImage() || IsBootImageExtension() || IsAppImage(); + } + // Are we compiling a boot image? bool IsBootImage() const { return image_type_ == ImageType::kBootImage; -- cgit v1.2.3-59-g8ed1b