From b3ef69168ffa71cb101e0bd418e70c5816881db6 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 4 Oct 2016 17:48:45 -0700 Subject: Fix build break from merge conflict Bug: 31113334 Test: mm -j32 Change-Id: I5643a0ec22cf03a54671a5c7fa0ebda41cc9a8c3 --- compiler/driver/compiler_driver-inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/driver/compiler_driver-inl.h') 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 fields_class = resolved_field->GetDeclaringClass(); - return CanReferrerAssumeClassIsInitialized(referrer_class, fields_class.Decode()); + return CanReferrerAssumeClassIsInitialized(referrer_class, fields_class.Ptr()); } inline ArtMethod* CompilerDriver::ResolveMethod( -- cgit v1.2.3-59-g8ed1b