diff options
| author | 2015-06-24 16:14:30 +0000 | |
|---|---|---|
| committer | 2015-06-24 16:14:31 +0000 | |
| commit | fdc9af0ed76aa1a6efa05b122c9bcfdbb7e1e991 (patch) | |
| tree | 8542c3d8c5dc0d643578b2e04fead5da5c5c63af /compiler/optimizing/optimizing_compiler.cc | |
| parent | 0c955b174bf64707ee0ee03195ed56f9cec26fa2 (diff) | |
| parent | 4824c27988c8eeb302791624bb3ce1d557b0db6c (diff) | |
Merge "Use a flag from the verifier to know if we should compile."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 146636675a..1944ba663a 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -677,7 +677,8 @@ CompiledMethod* OptimizingCompiler::Compile(const DexFile::CodeItem* code_item, const DexFile& dex_file) const { CompilerDriver* compiler_driver = GetCompilerDriver(); CompiledMethod* method = nullptr; - if (compiler_driver->IsMethodVerifiedWithoutFailures(method_idx, class_def_idx, dex_file)) { + if (compiler_driver->IsMethodVerifiedWithoutFailures(method_idx, class_def_idx, dex_file) && + !compiler_driver->GetVerifiedMethod(&dex_file, method_idx)->HasRuntimeThrow()) { method = TryCompile(code_item, access_flags, invoke_type, class_def_idx, method_idx, jclass_loader, dex_file); } else { |