Merge "ART: Add abort-on-soft-verifier-error"

1 files changed, 5 insertions, 0 deletions

diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index 311dbd569e..12de9be60b 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -226,6 +226,9 @@ class CompilerOptions FINAL {
   bool AbortOnHardVerifierFailure() const {
     return abort_on_hard_verifier_failure_;
   }
+  bool AbortOnSoftVerifierFailure() const {
+    return abort_on_soft_verifier_failure_;
+  }
 
   const std::vector<const DexFile*>* GetNoInlineFromDexFile() const {
     return no_inline_from_;
@@ -303,6 +306,8 @@ class CompilerOptions FINAL {
   // Abort compilation with an error if we find a class that fails verification with a hard
   // failure.
   bool abort_on_hard_verifier_failure_;
+  // Same for soft failures.
+  bool abort_on_soft_verifier_failure_;
 
   // Log initialization of initialization failures to this stream if not null.
   std::unique_ptr<std::ostream> init_failure_output_;