ART: set the check_bail_out flag to false by default

check_bail_out is disabled by default, set the flag to false

Change-Id: I17ede384cb6b77e88e9618a50b4c07cdf3fd2d19

3 files changed, 3 insertions, 32 deletions

diff --git a/compiler/dex/compiler_ir.cc b/compiler/dex/compiler_ir.cc
index 3a25b03bd3..6e1853bbd7 100644
--- a/compiler/dex/compiler_ir.cc
+++ b/compiler/dex/compiler_ir.cc
@@ -47,33 +47,7 @@ CompilationUnit::CompilationUnit(ArenaPool* pool, InstructionSet isa, CompilerDr
     mir_graph(nullptr),
     cg(nullptr),
     timings("QuickCompiler", true, false),
-    print_pass(false),
-    compiler_(nullptr) {
-}
-
-CompilationUnit::CompilationUnit(ArenaPool* pool, InstructionSet isa, CompilerDriver* driver,
-                                 ClassLinker* linker, const QuickCompiler* compiler)
-  : compiler_driver(driver),
-    class_linker(linker),
-    dex_file(nullptr),
-    class_loader(nullptr),
-    class_def_idx(0),
-    method_idx(0),
-    access_flags(0),
-    invoke_type(kDirect),
-    shorty(nullptr),
-    disable_opt(0),
-    enable_debug(0),
-    verbose(false),
-    instruction_set(isa),
-    target64(Is64BitInstructionSet(isa)),
-    arena(pool),
-    arena_stack(pool),
-    mir_graph(nullptr),
-    cg(nullptr),
-    timings("QuickCompiler", true, false),
-    print_pass(false),
-    compiler_(compiler) {
+    print_pass(false) {
 }
 
 CompilationUnit::~CompilationUnit() {
diff --git a/compiler/dex/compiler_ir.h b/compiler/dex/compiler_ir.h
index dc5af7210d..d28df1dcce 100644
--- a/compiler/dex/compiler_ir.h
+++ b/compiler/dex/compiler_ir.h
@@ -27,7 +27,6 @@
 #include "base/timing_logger.h"
 #include "invoke_type.h"
 #include "safe_map.h"
-#include "quick/quick_compiler.h"
 
 namespace art {
 
@@ -162,8 +161,6 @@ struct OptionContent {
 
 struct CompilationUnit {
   CompilationUnit(ArenaPool* pool, InstructionSet isa, CompilerDriver* driver, ClassLinker* linker);
-  CompilationUnit(ArenaPool* pool, InstructionSet isa, CompilerDriver* driver, ClassLinker* linker,
-                  const QuickCompiler* compiler);
   ~CompilationUnit();
 
   void StartTimingSplit(const char* label);
@@ -197,7 +194,7 @@ struct CompilationUnit {
   std::unique_ptr<Mir2Lir> cg;           // Target-specific codegen.
   TimingLogger timings;
   bool print_pass;                 // Do we want to print a pass or not?
-  const QuickCompiler* compiler_;
+
   /**
    * @brief Holds pass options for current pass being applied to compilation unit.
    * @details This is updated for every pass to contain the overridden pass options
diff --git a/compiler/dex/quick/quick_compiler.cc b/compiler/dex/quick/quick_compiler.cc
index 0e9d268681..e6456e7c49 100644
--- a/compiler/dex/quick/quick_compiler.cc
+++ b/compiler/dex/quick/quick_compiler.cc
@@ -651,7 +651,7 @@ CompiledMethod* QuickCompiler::Compile(const DexFile::CodeItem* code_item,
   if (instruction_set == kArm) {
     instruction_set = kThumb2;
   }
-  CompilationUnit cu(runtime->GetArenaPool(), instruction_set, driver, class_linker, this);
+  CompilationUnit cu(runtime->GetArenaPool(), instruction_set, driver, class_linker);
   cu.dex_file = &dex_file;
   cu.class_def_idx = class_def_idx;
   cu.method_idx = method_idx;