diff options
| author | 2015-08-27 16:04:21 +0000 | |
|---|---|---|
| committer | 2015-08-27 16:04:21 +0000 | |
| commit | 706ea6a0294ef8bc3def050142c548c082fa8e30 (patch) | |
| tree | 2a6737a452fe6059e47aefda8ec5b9778ff2d582 /compiler/optimizing | |
| parent | 772cc4a2d4f978888d1b1e5a78c1c16a108260ed (diff) | |
| parent | 0760a81257fa427646c309500d603194009265ef (diff) | |
Merge "ART: Propagate verifier failure types to the compilers"
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index f6bbace664..2a7699105c 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -795,8 +795,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) && - !compiler_driver->GetVerifiedMethod(&dex_file, method_idx)->HasRuntimeThrow()) { + DCHECK(!compiler_driver->GetVerifiedMethod(&dex_file, method_idx)->HasRuntimeThrow()); + if (compiler_driver->IsMethodVerifiedWithoutFailures(method_idx, class_def_idx, dex_file)) { method = TryCompile(code_item, access_flags, invoke_type, class_def_idx, method_idx, jclass_loader, dex_file); } else { |