From 4fa07a5727551018e2dcd93d41dac98f20212e99 Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Tue, 31 Mar 2020 20:52:09 +0100 Subject: 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 --- compiler/driver/compiler_options_map-inl.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'compiler/driver/compiler_options_map-inl.h') diff --git a/compiler/driver/compiler_options_map-inl.h b/compiler/driver/compiler_options_map-inl.h index e8a425d465..e80fb46503 100644 --- a/compiler/driver/compiler_options_map-inl.h +++ b/compiler/driver/compiler_options_map-inl.h @@ -43,6 +43,7 @@ inline bool ReadCompilerOptions(Base& map, CompilerOptions* options, std::string } options->SetCompilerFilter(compiler_filter); } + map.AssignIfExists(Base::CompileArtTest, &options->compile_art_test_); map.AssignIfExists(Base::HugeMethodMaxThreshold, &options->huge_method_threshold_); map.AssignIfExists(Base::LargeMethodMaxThreshold, &options->large_method_threshold_); map.AssignIfExists(Base::NumDexMethodsThreshold, &options->num_dex_methods_threshold_); @@ -110,6 +111,9 @@ inline void AddCompilerOptionsArgumentParserOptions(Builder& b) { .template WithType() .IntoKey(Map::CompilerFilter) + .Define({"--compile-art-test", "--no-compile-art-test"}) + .WithValues({true, false}) + .IntoKey(Map::CompileArtTest) .Define("--huge-method-max=_") .template WithType() .IntoKey(Map::HugeMethodMaxThreshold) -- cgit v1.2.3-59-g8ed1b