From 96f1c792b093c3a07cc960046419047f390d049c Mon Sep 17 00:00:00 2001
From: Vladimír Marko <vmarko@google.com>
Date: Fri, 25 Oct 2024 14:51:37 +0000
Subject: Reland "verifier: Cache types by type index."

This reverts commit de7910029c3400a11070e818ae1463614c302a16.

Reason for revert: Relanding with a fix - keep forced class
resolution in `MethodVerifier<>::ResolveClass<>()`.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing --jit-on-first-use
Bug: 181943478
Change-Id: Ibdf8b5515ca6c3e4106e1a09700ca65565ce36bb
---
 runtime/verifier/method_verifier.h | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'runtime/verifier/method_verifier.h')

diff --git a/runtime/verifier/method_verifier.h b/runtime/verifier/method_verifier.h
index e12a2f8fb1..711b455c2d 100644
--- a/runtime/verifier/method_verifier.h
+++ b/runtime/verifier/method_verifier.h
@@ -116,7 +116,6 @@ class MethodVerifier {
                                                           RegTypeCache* reg_types,
                                                           ArtMethod* method,
                                                           Handle<mirror::DexCache> dex_cache,
-                                                          Handle<mirror::ClassLoader> class_loader,
                                                           uint32_t dex_pc)
       REQUIRES_SHARED(Locks::mutator_lock_);
 
@@ -196,7 +195,6 @@ class MethodVerifier {
                  ArenaPool* arena_pool,
                  RegTypeCache* reg_types,
                  VerifierDeps* verifier_deps,
-                 const DexFile* dex_file,
                  const dex::ClassDef& class_def,
                  const dex::CodeItem* code_item,
                  uint32_t dex_method_idx,
@@ -229,9 +227,7 @@ class MethodVerifier {
                                   RegTypeCache* reg_types,
                                   VerifierDeps* verifier_deps,
                                   uint32_t method_idx,
-                                  const DexFile* dex_file,
                                   Handle<mirror::DexCache> dex_cache,
-                                  Handle<mirror::ClassLoader> class_loader,
                                   const dex::ClassDef& class_def_idx,
                                   const dex::CodeItem* code_item,
                                   uint32_t method_access_flags,
@@ -247,9 +243,7 @@ class MethodVerifier {
                                   RegTypeCache* reg_types,
                                   VerifierDeps* verifier_deps,
                                   uint32_t method_idx,
-                                  const DexFile* dex_file,
                                   Handle<mirror::DexCache> dex_cache,
-                                  Handle<mirror::ClassLoader> class_loader,
                                   const dex::ClassDef& class_def_idx,
                                   const dex::CodeItem* code_item,
                                   uint32_t method_access_flags,
@@ -267,9 +261,7 @@ class MethodVerifier {
   static MethodVerifier* CreateVerifier(Thread* self,
                                         RegTypeCache* reg_types,
                                         VerifierDeps* verifier_deps,
-                                        const DexFile* dex_file,
                                         Handle<mirror::DexCache> dex_cache,
-                                        Handle<mirror::ClassLoader> class_loader,
                                         const dex::ClassDef& class_def,
                                         const dex::CodeItem* code_item,
                                         uint32_t method_idx,
-- 
cgit v1.2.3-59-g8ed1b