Revert^4 "Add "linkage" test options""
This reverts commit 16c08ca97486f535698f1a1b17f0332bfe78e95a.
Reason for revert: Disabled on device testing
Change-Id: I8d5442e0ebb6383ebfbce98f1857b5e844e0d5e1
Bug: none
Test: make test-art-host-gtest-dex2oat_test
diff --git a/compiler/driver/compiler_options.cc b/compiler/driver/compiler_options.cc
index cde6ae9..5681134 100644
--- a/compiler/driver/compiler_options.cc
+++ b/compiler/driver/compiler_options.cc
@@ -73,6 +73,8 @@
dump_cfg_file_name_(""),
dump_cfg_append_(false),
force_determinism_(false),
+ check_linkage_conditions_(false),
+ crash_on_linkage_violation_(false),
deduplicate_code_(true),
count_hotness_in_compiled_code_(false),
resolve_startup_const_strings_(false),
diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index 79ba1c2..639c547 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -311,6 +311,14 @@
return force_determinism_;
}
+ bool IsCheckLinkageConditions() const {
+ return check_linkage_conditions_;
+ }
+
+ bool IsCrashOnLinkageViolation() const {
+ return crash_on_linkage_violation_;
+ }
+
bool DeduplicateCode() const {
return deduplicate_code_;
}
@@ -431,6 +439,13 @@
// outcomes.
bool force_determinism_;
+ // Whether the compiler should check for violation of the conditions required to perform AOT
+ // "linkage".
+ bool check_linkage_conditions_;
+ // Whether the compiler should crash when encountering a violation of one of
+ // the conditions required to perform AOT "linkage".
+ bool crash_on_linkage_violation_;
+
// Whether code should be deduplicated.
bool deduplicate_code_;