commit a43ba3da86c046c545a988f3d40f53c24a525f83
author Andreas Gampe <agampe@google.com> Wed Mar 13 15:49:20 2019 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 15 16:11:36 2019 +0000
tree a66479561d9f14a9b19e31a9a6851f81ae50673c
parent e37b7915908dba10e90c39a3a82cb0cd1dc05f5c

ART: Add ClassVerifier

Remove class handling from MethodVerifier.

Test: m test-art-host
Change-Id: I0e125e0c8a852936ed7cff0f349a7fde97f62826

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index e5dcc0d..4364590 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -133,7 +133,7 @@
 #include "thread_list.h"
 #include "trace.h"
 #include "utils/dex_cache_arrays_layout-inl.h"
-#include "verifier/method_verifier.h"
+#include "verifier/class_verifier.h"
 #include "well_known_classes.h"
 
 namespace art {
@@ -900,7 +900,7 @@
   // initialize the StackOverflowError class (as it might require running the verifier). Instead,
   // ensure that the class will be initialized.
   if (kMemoryToolIsAvailable && !Runtime::Current()->IsAotCompiler()) {
-    verifier::MethodVerifier::Init();  // Need to prepare the verifier.
+    verifier::ClassVerifier::Init();  // Need to prepare the verifier.
 
     ObjPtr<mirror::Class> soe_klass = FindSystemClass(self, "Ljava/lang/StackOverflowError;");
     if (soe_klass == nullptr || !EnsureInitialized(self, hs.NewHandle(soe_klass), true, true)) {
@@ -4608,13 +4608,13 @@
                                                             verifier::HardFailLogMode log_level,
                                                             std::string* error_msg) {
   Runtime* const runtime = Runtime::Current();
-  return verifier::MethodVerifier::VerifyClass(self,
-                                               klass.Get(),
-                                               runtime->GetCompilerCallbacks(),
-                                               runtime->IsAotCompiler(),
-                                               log_level,
-                                               Runtime::Current()->GetTargetSdkVersion(),
-                                               error_msg);
+  return verifier::ClassVerifier::VerifyClass(self,
+                                              klass.Get(),
+                                              runtime->GetCompilerCallbacks(),
+                                              runtime->IsAotCompiler(),
+                                              log_level,
+                                              Runtime::Current()->GetTargetSdkVersion(),
+                                              error_msg);
 }
 
 bool ClassLinker::VerifyClassUsingOatFile(const DexFile& dex_file,