diff options
author | 2016-10-18 16:27:40 -0700 | |
---|---|---|
committer | 2016-10-19 10:04:37 -0700 | |
commit | 28357fab628bd9b91749988b554977398caf9963 (patch) | |
tree | 957fac3c1003713c349e0e216762836138c596a7 /runtime/class_table.cc | |
parent | c89f9776a107ca20d0146c16fa881db91c4f8266 (diff) |
Move most of class linker to ObjPtr
Return values are still mirror pointer. Fix some failing asserts in
compiler driver and tests.
Bug: 31113334
Test: test-art-host
Change-Id: I4450bf9dfb2541749496b8388616e8aae8488919
Diffstat (limited to 'runtime/class_table.cc')
-rw-r--r-- | runtime/class_table.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/class_table.cc b/runtime/class_table.cc index d43505054e..97c0abdda3 100644 --- a/runtime/class_table.cc +++ b/runtime/class_table.cc @@ -31,7 +31,7 @@ void ClassTable::FreezeSnapshot() { classes_.push_back(ClassSet()); } -bool ClassTable::Contains(mirror::Class* klass) { +bool ClassTable::Contains(ObjPtr<mirror::Class> klass) { ReaderMutexLock mu(Thread::Current(), lock_); for (ClassSet& class_set : classes_) { auto it = class_set.Find(GcRoot<mirror::Class>(klass)); @@ -42,7 +42,7 @@ bool ClassTable::Contains(mirror::Class* klass) { return false; } -mirror::Class* ClassTable::LookupByDescriptor(mirror::Class* klass) { +mirror::Class* ClassTable::LookupByDescriptor(ObjPtr<mirror::Class> klass) { ReaderMutexLock mu(Thread::Current(), lock_); for (ClassSet& class_set : classes_) { auto it = class_set.Find(GcRoot<mirror::Class>(klass)); @@ -108,16 +108,16 @@ mirror::Class* ClassTable::Lookup(const char* descriptor, size_t hash) { return nullptr; } -void ClassTable::Insert(mirror::Class* klass) { +void ClassTable::Insert(ObjPtr<mirror::Class> klass) { WriterMutexLock mu(Thread::Current(), lock_); classes_.back().Insert(GcRoot<mirror::Class>(klass)); } -void ClassTable::InsertWithoutLocks(mirror::Class* klass) { +void ClassTable::InsertWithoutLocks(ObjPtr<mirror::Class> klass) { classes_.back().Insert(GcRoot<mirror::Class>(klass)); } -void ClassTable::InsertWithHash(mirror::Class* klass, size_t hash) { +void ClassTable::InsertWithHash(ObjPtr<mirror::Class> klass, size_t hash) { WriterMutexLock mu(Thread::Current(), lock_); classes_.back().InsertWithHash(GcRoot<mirror::Class>(klass), hash); } |