diff options
| author | 2016-09-30 10:27:43 -0700 | |
|---|---|---|
| committer | 2016-10-03 14:06:27 -0700 | |
| commit | 3398c7874e002beaa6c2b2fadf183e7d1ddad23a (patch) | |
| tree | 7db754b5b0c3a6c68bc1f91d7cb2477f534d2ad3 /runtime/quick/inline_method_analyser.cc | |
| parent | 462e21cc8d28a4d48342cf0f634bd1ecc63647d7 (diff) | |
Move ArtField to ObjPtr
Added EXPECT_OBJ_PTR_EQ and variants to gtests.
Fixed moving GC bugs in:
ClassLinker::CreatePathClassLoader
ClassLinkerTest: StaticFields
ObjPtr Decode call sites: 186 -> 181.
Some tests fail due to ResolvedFieldAccessTest, will fix in follow
up CL.
Bug: 31113334
Test: test-art-host CC baker
Change-Id: I8b266ad00f3c20c8cbe7cfdf280d175083df0b88
Diffstat (limited to 'runtime/quick/inline_method_analyser.cc')
| -rw-r--r-- | runtime/quick/inline_method_analyser.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/quick/inline_method_analyser.cc b/runtime/quick/inline_method_analyser.cc index dc6f4ebc9c..b009b47195 100644 --- a/runtime/quick/inline_method_analyser.cc +++ b/runtime/quick/inline_method_analyser.cc @@ -738,8 +738,8 @@ bool InlineMethodAnalyser::ComputeSpecialAccessorInfo(ArtMethod* method, if (field == nullptr || field->IsStatic()) { return false; } - mirror::Class* method_class = method->GetDeclaringClass(); - mirror::Class* field_class = field->GetDeclaringClass(); + ObjPtr<mirror::Class> method_class = method->GetDeclaringClass(); + ObjPtr<mirror::Class> field_class = field->GetDeclaringClass(); if (!method_class->CanAccessResolvedField(field_class, field, dex_cache, field_idx) || (is_put && field->IsFinal() && method_class != field_class)) { return false; |