From 0a6063a07edf210979de199aecead92647b8752c Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 14 May 2020 16:39:14 +0100 Subject: Clean up Field::CreateFromArtField(). Remove code dealing with the DexCache. This was obsolete since switching to hash-based DexCache arrays. This makes the last remaining template parameter unused, so remove it and move the implementation to the .cc file. Test: m test-art-host-gtest Test: testrunner.py --host --optmizing Test: aost_taimen-userdebug boots. Change-Id: Ib2077028f45792e4357d9c57280ece70a22e47a2 --- runtime/native/java_lang_Class.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'runtime/native/java_lang_Class.cc') diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index c47d5e4fe9..7ea07464db 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -33,7 +33,7 @@ #include "mirror/class-alloc-inl.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" -#include "mirror/field-inl.h" +#include "mirror/field.h" #include "mirror/method.h" #include "mirror/method_handles_lookup.h" #include "mirror/object-inl.h" @@ -312,7 +312,7 @@ static ObjPtr> GetDeclaredFields( for (ArtField& field : ifields) { if (IsDiscoverable(public_only, hiddenapi_context, &field)) { ObjPtr reflect_field = - mirror::Field::CreateFromArtField(self, &field, force_resolve); + mirror::Field::CreateFromArtField(self, &field, force_resolve); if (reflect_field == nullptr) { if (kIsDebugBuild) { self->AssertPendingException(); @@ -326,7 +326,7 @@ static ObjPtr> GetDeclaredFields( for (ArtField& field : sfields) { if (IsDiscoverable(public_only, hiddenapi_context, &field)) { ObjPtr reflect_field = - mirror::Field::CreateFromArtField(self, &field, force_resolve); + mirror::Field::CreateFromArtField(self, &field, force_resolve); if (reflect_field == nullptr) { if (kIsDebugBuild) { self->AssertPendingException(); @@ -417,11 +417,11 @@ ALWAYS_INLINE static inline ObjPtr GetDeclaredField(Thread* self, } ArtField* art_field = FindFieldByName(name, c->GetIFieldsPtr()); if (art_field != nullptr) { - return mirror::Field::CreateFromArtField(self, art_field, true); + return mirror::Field::CreateFromArtField(self, art_field, true); } art_field = FindFieldByName(name, c->GetSFieldsPtr()); if (art_field != nullptr) { - return mirror::Field::CreateFromArtField(self, art_field, true); + return mirror::Field::CreateFromArtField(self, art_field, true); } return nullptr; } -- cgit v1.2.3-59-g8ed1b