summaryrefslogtreecommitdiff
path: root/runtime/class_linker-inl.h
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2016-10-04 13:54:57 -0700
committer Mathieu Chartier <mathieuc@google.com> 2016-10-13 10:59:28 -0700
commit28bd2e4f151267b34b8e1eb19c489d8d547bbf5c (patch)
treed99ae3fe74ea63b83091898d830d3efe68cd479d /runtime/class_linker-inl.h
parent6e5fa09510c7280168e040382d27dd8b55760d9a (diff)
Move mirror::Class to use ObjPtr
Leave the return types as non ObjPtr for now. Fixed moving GC bugs in tests. Test: test-art-host Bug: 31113334 Change-Id: I5da1b5ac55dfbc5cc97a64be2c870ba9f512d9b0
Diffstat (limited to 'runtime/class_linker-inl.h')
-rw-r--r--runtime/class_linker-inl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/class_linker-inl.h b/runtime/class_linker-inl.h
index fa971c4c2b..dba9b8fb48 100644
--- a/runtime/class_linker-inl.h
+++ b/runtime/class_linker-inl.h
@@ -200,7 +200,7 @@ inline ArtField* ClassLinker::ResolveField(uint32_t field_idx, ArtMethod* referr
inline mirror::Object* ClassLinker::AllocObject(Thread* self) {
return GetClassRoot(kJavaLangObject)->Alloc<true, false>(
self,
- Runtime::Current()->GetHeap()->GetCurrentAllocator());
+ Runtime::Current()->GetHeap()->GetCurrentAllocator()).Ptr();
}
template <class T>