From ab91eefc875956752c20e47f5e23715597b41511 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 14 Sep 2021 09:48:51 +0100
Subject: Address review comments on method resolution.

Follow-up after:
https://android-review.googlesource.com/c/platform/art/+/1825135

Test: 827-resolve-method
Bug: 199246839
Change-Id: I085348040308d70730bd7f90bd3aa8ded5113087
---
 runtime/class_linker-inl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime/class_linker-inl.h')

diff --git a/runtime/class_linker-inl.h b/runtime/class_linker-inl.h
index 13191016b2..65b2afd949 100644
--- a/runtime/class_linker-inl.h
+++ b/runtime/class_linker-inl.h
@@ -164,7 +164,7 @@ inline ObjPtr<mirror::Class> ClassLinker::ResolveType(dex::TypeIndex type_idx,
                                                       Handle<mirror::DexCache> dex_cache,
                                                       Handle<mirror::ClassLoader> class_loader) {
   DCHECK(dex_cache != nullptr);
-  DCHECK(dex_cache->GetClassLoader().Ptr() == class_loader.Get());
+  DCHECK(dex_cache->GetClassLoader() == class_loader.Get());
   Thread::PoisonObjectPointersIfDebug();
   ObjPtr<mirror::Class> resolved = dex_cache->GetResolvedType(type_idx);
   if (resolved == nullptr) {
@@ -213,7 +213,7 @@ inline ObjPtr<mirror::Class> ClassLinker::LookupResolvedType(
     dex::TypeIndex type_idx,
     ObjPtr<mirror::DexCache> dex_cache,
     ObjPtr<mirror::ClassLoader> class_loader) {
-  DCHECK(dex_cache->GetClassLoader().Ptr() == class_loader.Ptr());
+  DCHECK(dex_cache->GetClassLoader() == class_loader);
   ObjPtr<mirror::Class> type = dex_cache->GetResolvedType(type_idx);
   if (type == nullptr) {
     type = DoLookupResolvedType(type_idx, dex_cache, class_loader);
@@ -291,7 +291,7 @@ inline bool ClassLinker::CheckInvokeClassMismatch(ObjPtr<mirror::DexCache> dex_c
 inline ArtMethod* ClassLinker::LookupResolvedMethod(uint32_t method_idx,
                                                     ObjPtr<mirror::DexCache> dex_cache,
                                                     ObjPtr<mirror::ClassLoader> class_loader) {
-  DCHECK(dex_cache->GetClassLoader().Ptr() == class_loader.Ptr());
+  DCHECK(dex_cache->GetClassLoader() == class_loader);
   ArtMethod* resolved = dex_cache->GetResolvedMethod(method_idx);
   if (resolved == nullptr) {
     const DexFile& dex_file = *dex_cache->GetDexFile();
-- 
cgit v1.2.3-59-g8ed1b