diff options
| author | 2019-03-13 15:49:20 -0700 | |
|---|---|---|
| committer | 2019-03-15 16:11:36 +0000 | |
| commit | a43ba3da86c046c545a988f3d40f53c24a525f83 (patch) | |
| tree | a66479561d9f14a9b19e31a9a6851f81ae50673c /dex2oat/driver/compiler_driver.cc | |
| parent | e37b7915908dba10e90c39a3a82cb0cd1dc05f5c (diff) | |
ART: Add ClassVerifier
Remove class handling from MethodVerifier.
Test: m test-art-host
Change-Id: I0e125e0c8a852936ed7cff0f349a7fde97f62826
Diffstat (limited to 'dex2oat/driver/compiler_driver.cc')
| -rw-r--r-- | dex2oat/driver/compiler_driver.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc index b73a7d8165..520b455a7a 100644 --- a/dex2oat/driver/compiler_driver.cc +++ b/dex2oat/driver/compiler_driver.cc @@ -85,8 +85,7 @@ #include "utils/dex_cache_arrays_layout-inl.h" #include "utils/swap_space.h" #include "vdex_file.h" -#include "verifier/method_verifier-inl.h" -#include "verifier/method_verifier.h" +#include "verifier/class_verifier.h" #include "verifier/verifier_deps.h" #include "verifier/verifier_enums.h" @@ -1884,16 +1883,16 @@ class VerifyClassVisitor : public CompilationVisitor { soa.Self(), dex_file))); std::string error_msg; failure_kind = - verifier::MethodVerifier::VerifyClass(soa.Self(), - &dex_file, - dex_cache, - class_loader, - class_def, - Runtime::Current()->GetCompilerCallbacks(), - true /* allow soft failures */, - log_level_, - sdk_version_, - &error_msg); + verifier::ClassVerifier::VerifyClass(soa.Self(), + &dex_file, + dex_cache, + class_loader, + class_def, + Runtime::Current()->GetCompilerCallbacks(), + true /* allow soft failures */, + log_level_, + sdk_version_, + &error_msg); if (failure_kind == verifier::FailureKind::kHardFailure) { LOG(ERROR) << "Verification failed on class " << PrettyDescriptor(descriptor) << " because: " << error_msg; |