From a43ba3da86c046c545a988f3d40f53c24a525f83 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 13 Mar 2019 15:49:20 -0700 Subject: ART: Add ClassVerifier Remove class handling from MethodVerifier. Test: m test-art-host Change-Id: I0e125e0c8a852936ed7cff0f349a7fde97f62826 --- runtime/verifier/method_verifier.h | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'runtime/verifier/method_verifier.h') diff --git a/runtime/verifier/method_verifier.h b/runtime/verifier/method_verifier.h index c178df05a4..92abe9bd5d 100644 --- a/runtime/verifier/method_verifier.h +++ b/runtime/verifier/method_verifier.h @@ -99,27 +99,6 @@ class PcToRegisterLineTable { // The verifier class MethodVerifier { public: - // Verify a class. Returns "kNoFailure" on success. - static FailureKind VerifyClass(Thread* self, - ObjPtr klass, - CompilerCallbacks* callbacks, - bool allow_soft_failures, - HardFailLogMode log_level, - uint32_t api_level, - std::string* error) - REQUIRES_SHARED(Locks::mutator_lock_); - static FailureKind VerifyClass(Thread* self, - const DexFile* dex_file, - Handle dex_cache, - Handle class_loader, - const dex::ClassDef& class_def, - CompilerCallbacks* callbacks, - bool allow_soft_failures, - HardFailLogMode log_level, - uint32_t api_level, - std::string* error) - REQUIRES_SHARED(Locks::mutator_lock_); - static MethodVerifier* VerifyMethodAndDump(Thread* self, VariableIndentationOutputStream* vios, uint32_t method_idx, @@ -807,6 +786,7 @@ class MethodVerifier { const uint32_t api_level_; friend class art::Thread; + friend class ClassVerifier; friend class VerifierDepsTest; DISALLOW_COPY_AND_ASSIGN(MethodVerifier); -- cgit v1.2.3-59-g8ed1b