summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-11-04 12:14:56 -0800
committerSteve Kondik <steve@cyngn.com>2015-11-04 12:14:56 -0800
commit888c9bd1fe419ab9e9e1bd90e8534336107515be (patch)
tree82c1ea300afee7a56628c5a335757b534817660f
parent36dc4cef3347f8a6bae7cbeda1c77e636e16fab1 (diff)
downloadart-888c9bd1fe419ab9e9e1bd90e8534336107515be.zip
art-888c9bd1fe419ab9e9e1bd90e8534336107515be.tar.gz
art-888c9bd1fe419ab9e9e1bd90e8534336107515be.tar.bz2
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
-rw-r--r--compiler/driver/compiler_driver.cc3
1 files changed, 3 insertions, 0 deletions
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);
}