Add explicit compiler option to enable test-specific features.
We can no longer rely on checking the "core.art" image name,
since we plan to remove it and use the shipped boot image.
This option enables test-specific features, such as $noinline$.
Test: ./art/test.py -r --optimizing --64
Bug: 147817558
Change-Id: Iadac6e1b0f46e83efd0551fb8462a6b268ad33d8
diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index 639c547..6cdb821 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -218,11 +218,10 @@
return image_type_ == ImageType::kAppImage;
}
- // 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_;
+ // Returns whether we are running ART tests.
+ // The compiler will use that information for checking invariants.
+ bool CompileArtTest() const {
+ return compile_art_test_;
}
// Should the code be compiled as position independent?
@@ -367,10 +366,6 @@
return initialize_app_image_classes_;
}
- // Is `boot_image_filename` the name of a core image (small boot
- // image used for ART testing only)?
- static bool IsCoreImageFilename(const std::string& boot_image_filename);
-
private:
bool ParseDumpInitFailures(const std::string& option, std::string* error_msg);
bool ParseRegisterAllocationStrategy(const std::string& option, std::string* error_msg);
@@ -400,7 +395,7 @@
const VerificationResults* verification_results_;
ImageType image_type_;
- bool compiling_with_core_image_;
+ bool compile_art_test_;
bool baseline_;
bool debuggable_;
bool generate_debug_info_;