diff options
| author | 2016-10-05 00:54:38 +0000 | |
|---|---|---|
| committer | 2016-10-05 00:54:39 +0000 | |
| commit | c13fbeb2201dc0bf783670d4548a49f03b1cb33e (patch) | |
| tree | 8531ef73e7495c073d5780d8999952609f9e404c | |
| parent | 556c9a2f182c4fcb9eba9dc4937095665f314a2b (diff) | |
| parent | b3ef69168ffa71cb101e0bd418e70c5816881db6 (diff) | |
Merge "Fix build break from merge conflict"
| -rw-r--r-- | compiler/driver/compiler_driver-inl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index 3e9e3cbce6..0884a2a9f5 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -253,7 +253,7 @@ inline bool CompilerDriver::IsStaticFieldsClassInitialized(mirror::Class* referr ArtField* resolved_field) { DCHECK(resolved_field->IsStatic()); ObjPtr<mirror::Class> fields_class = resolved_field->GetDeclaringClass(); - return CanReferrerAssumeClassIsInitialized(referrer_class, fields_class.Decode()); + return CanReferrerAssumeClassIsInitialized(referrer_class, fields_class.Ptr()); } inline ArtMethod* CompilerDriver::ResolveMethod( |