From f850690a901c01d95210e3ecf66aa7255206aafc Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 14 Jun 2024 11:58:13 +0000 Subject: Use `ClassAccessor::GetViewDescriptor()` more. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Bug: 338123769 Change-Id: Ib8206f037ece05374e16b8a3816520ea9bc70931 --- tools/hiddenapi/hiddenapi_test.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/hiddenapi/hiddenapi_test.cc') diff --git a/tools/hiddenapi/hiddenapi_test.cc b/tools/hiddenapi/hiddenapi_test.cc index fe7677efff..3236dddfd3 100644 --- a/tools/hiddenapi/hiddenapi_test.cc +++ b/tools/hiddenapi/hiddenapi_test.cc @@ -178,7 +178,7 @@ class HiddenApiTest : public CommonRuntimeTest { const dex::ClassDef& class_def, const DexFile& dex_file) { ClassAccessor accessor(dex_file, class_def, /* parse hiddenapi flags */ true); - CHECK(accessor.HasClassData()) << "Class " << accessor.GetDescriptor() << " has no data"; + CHECK(accessor.HasClassData()) << "Class " << accessor.GetDescriptorView() << " has no data"; if (!accessor.HasHiddenapiClassData()) { return hiddenapi::ApiList::Sdk(); @@ -189,7 +189,7 @@ class HiddenApiTest : public CommonRuntimeTest { if (strcmp(name, dex_file.GetFieldName(fid)) == 0) { const uint32_t actual_visibility = field.GetAccessFlags() & kAccVisibilityFlags; CHECK_EQ(actual_visibility, expected_visibility) - << "Field " << name << " in class " << accessor.GetDescriptor(); + << "Field " << name << " in class " << accessor.GetDescriptorView(); return hiddenapi::ApiList(field.GetHiddenapiFlags()); } } @@ -205,7 +205,7 @@ class HiddenApiTest : public CommonRuntimeTest { const dex::ClassDef& class_def, const DexFile& dex_file) { ClassAccessor accessor(dex_file, class_def, /* parse hiddenapi flags */ true); - CHECK(accessor.HasClassData()) << "Class " << accessor.GetDescriptor() << " has no data"; + CHECK(accessor.HasClassData()) << "Class " << accessor.GetDescriptorView() << " has no data"; if (!accessor.HasHiddenapiClassData()) { return hiddenapi::ApiList::Sdk(); @@ -215,10 +215,10 @@ class HiddenApiTest : public CommonRuntimeTest { const dex::MethodId& mid = dex_file.GetMethodId(method.GetIndex()); if (strcmp(name, dex_file.GetMethodName(mid)) == 0) { CHECK_EQ(expected_native, method.MemberIsNative()) - << "Method " << name << " in class " << accessor.GetDescriptor(); + << "Method " << name << " in class " << accessor.GetDescriptorView(); const uint32_t actual_visibility = method.GetAccessFlags() & kAccVisibilityFlags; CHECK_EQ(actual_visibility, expected_visibility) - << "Method " << name << " in class " << accessor.GetDescriptor(); + << "Method " << name << " in class " << accessor.GetDescriptorView(); return hiddenapi::ApiList(method.GetHiddenapiFlags()); } } -- cgit v1.2.3-59-g8ed1b