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
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc
index c47d5e4..7ea0746 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 @@
for (ArtField& field : ifields) {
if (IsDiscoverable(public_only, hiddenapi_context, &field)) {
ObjPtr<mirror::Field> reflect_field =
- mirror::Field::CreateFromArtField<kRuntimePointerSize>(self, &field, force_resolve);
+ mirror::Field::CreateFromArtField(self, &field, force_resolve);
if (reflect_field == nullptr) {
if (kIsDebugBuild) {
self->AssertPendingException();
@@ -326,7 +326,7 @@
for (ArtField& field : sfields) {
if (IsDiscoverable(public_only, hiddenapi_context, &field)) {
ObjPtr<mirror::Field> reflect_field =
- mirror::Field::CreateFromArtField<kRuntimePointerSize>(self, &field, force_resolve);
+ mirror::Field::CreateFromArtField(self, &field, force_resolve);
if (reflect_field == nullptr) {
if (kIsDebugBuild) {
self->AssertPendingException();
@@ -417,11 +417,11 @@
}
ArtField* art_field = FindFieldByName(name, c->GetIFieldsPtr());
if (art_field != nullptr) {
- return mirror::Field::CreateFromArtField<kRuntimePointerSize>(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<kRuntimePointerSize>(self, art_field, true);
+ return mirror::Field::CreateFromArtField(self, art_field, true);
}
return nullptr;
}