From 888c9bd1fe419ab9e9e1bd90e8534336107515be Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Wed, 4 Nov 2015 12:14:56 -0800 Subject: art: Set check_bail_out to false by default * As it is supposed to be, thus unbreaking the compiler when used with the extension. Change-Id: I37499652ab0c3d33cdfccffef8664c9eb470a931 --- compiler/driver/compiler_driver.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index d37fda2..d150ed0 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -74,6 +74,8 @@ namespace art { +extern thread_local bool check_bail_out; + static constexpr bool kTimeCompileMethod = !kIsDebugBuild; // Whether to produce 64-bit ELF files for 64-bit targets. @@ -2292,6 +2294,7 @@ void CompilerDriver::CompileMethod(Thread* self, const DexFile::CodeItem* code_i IsMethodToCompile(method_ref); if (compile) { // NOTE: if compiler declines to compile this method, it will return null. + check_bail_out = false; compiled_method = compiler_->Compile(code_item, access_flags, invoke_type, class_def_idx, method_idx, class_loader, dex_file); } -- cgit v1.1