diff options
| author | 2018-07-18 10:58:13 +0100 | |
|---|---|---|
| committer | 2018-07-19 16:04:38 +0100 | |
| commit | d93e374e273dd45f5d829399da1d4201bf46057e (patch) | |
| tree | 280dc72b2aec4696bbc35ad39ca8d3479107380e /runtime/entrypoints/entrypoint_utils-inl.h | |
| parent | 7f7f9d3991f3a55da8934a3b72890d4776373598 (diff) | |
ObjPtr<>-ify ArtMethod and mirror::Method.
And clean up some forgotten things after old CLs.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 31113334
Change-Id: I8af0e845c24d674d0efab21d80c29949b1cc0593
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils-inl.h')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils-inl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h index 40ef10f904..0ed26d37c0 100644 --- a/runtime/entrypoints/entrypoint_utils-inl.h +++ b/runtime/entrypoints/entrypoint_utils-inl.h @@ -255,7 +255,7 @@ inline mirror::Class* CheckArrayAlloc(dex::TypeIndex type_idx, CHECK(klass->IsArrayClass()) << klass->PrettyClass(); } if (kAccessCheck) { - mirror::Class* referrer = method->GetDeclaringClass(); + ObjPtr<mirror::Class> referrer = method->GetDeclaringClass(); if (UNLIKELY(!referrer->CanAccess(klass))) { ThrowIllegalAccessErrorClass(referrer, klass); *slow_path = true; @@ -366,7 +366,7 @@ inline ArtField* FindFieldFromCode(uint32_t field_idx, ThrowIncompatibleClassChangeErrorField(resolved_field, is_static, referrer); return nullptr; } - mirror::Class* referring_class = referrer->GetDeclaringClass(); + ObjPtr<mirror::Class> referring_class = referrer->GetDeclaringClass(); if (UNLIKELY(!referring_class->CheckResolvedFieldAccess(fields_class, resolved_field, referrer->GetDexCache(), @@ -721,7 +721,7 @@ inline ObjPtr<mirror::Class> ResolveVerifyAndClinit(dex::TypeIndex type_idx, return nullptr; // Failure - Indicate to caller to deliver exception } // Perform access check if necessary. - mirror::Class* referring_class = referrer->GetDeclaringClass(); + ObjPtr<mirror::Class> referring_class = referrer->GetDeclaringClass(); if (verify_access && UNLIKELY(!referring_class->CanAccess(klass))) { ThrowIllegalAccessErrorClass(referring_class, klass); return nullptr; // Failure - Indicate to caller to deliver exception |