diff options
author | Calin Juravle <calin@google.com> | 2015-04-13 14:25:53 +0000 |
---|---|---|
committer | Calin Juravle <calin@google.com> | 2015-04-13 14:25:53 +0000 |
commit | 031af41d1debbdbd8964d7c504a789068dfe6029 (patch) | |
tree | a480bdc4a80f63d46abcde2ef7a36e1ad072d624 /compiler/optimizing/optimizing_compiler.cc | |
parent | c751d37e692d89b360f3c09421401f581b5c6d06 (diff) | |
download | art-031af41d1debbdbd8964d7c504a789068dfe6029.tar.gz art-031af41d1debbdbd8964d7c504a789068dfe6029.tar.bz2 art-031af41d1debbdbd8964d7c504a789068dfe6029.zip |
Revert "Fallback to quick in case of soft verification errors"
This reverts commit c751d37e692d89b360f3c09421401f581b5c6d06.
Change-Id: I2183df8e856410989bc019f6a1f58af37d5d7eab
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 4f58462a96..0e02212867 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -31,8 +31,6 @@ #include "constant_folding.h" #include "dead_code_elimination.h" #include "dex/quick/dex_file_to_method_inliner_map.h" -#include "dex/verified_method.h" -#include "dex/verification_results.h" #include "driver/compiler_driver.h" #include "driver/compiler_options.h" #include "driver/dex_compilation_unit.h" @@ -47,13 +45,13 @@ #include "mirror/art_method-inl.h" #include "nodes.h" #include "prepare_for_register_allocation.h" -#include "reference_type_propagation.h" #include "register_allocator.h" #include "side_effects_analysis.h" #include "ssa_builder.h" #include "ssa_phi_elimination.h" #include "ssa_liveness_analysis.h" #include "utils/assembler.h" +#include "reference_type_propagation.h" namespace art { @@ -608,26 +606,15 @@ CompiledMethod* OptimizingCompiler::Compile(const DexFile::CodeItem* code_item, InvokeType invoke_type, uint16_t class_def_idx, uint32_t method_idx, - jobject jclass_loader, + jobject class_loader, const DexFile& dex_file) const { - CompilerDriver* compiler_driver = GetCompilerDriver(); - CompiledMethod* method = nullptr; - if (compiler_driver->IsMethodVerifiedWithoutFailures(method_idx, dex_file)) { - method = TryCompile(code_item, access_flags, invoke_type, class_def_idx, - method_idx, jclass_loader, dex_file); - } else { - if (compiler_driver->GetCompilerOptions().VerifyAtRuntime()) { - compilation_stats_.RecordStat(MethodCompilationStat::kNotCompiledVerifyAtRuntime); - } else { - compilation_stats_.RecordStat(MethodCompilationStat::kNotCompiledClassNotVerified); - } - } - + CompiledMethod* method = TryCompile(code_item, access_flags, invoke_type, class_def_idx, + method_idx, class_loader, dex_file); if (method != nullptr) { return method; } method = delegate_->Compile(code_item, access_flags, invoke_type, class_def_idx, method_idx, - jclass_loader, dex_file); + class_loader, dex_file); if (method != nullptr) { compilation_stats_.RecordStat(MethodCompilationStat::kCompiledQuick); |