summaryrefslogtreecommitdiff
path: root/runtime/class_table.cc
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2016-06-04 00:22:32 +0000
committer Brian Carlstrom <bdc@google.com> 2016-06-04 00:22:32 +0000
commitf102faf1bcbdb2149e3e7bf27b1819f621b7894b (patch)
treed3e9d667bc7d746a0800e95d4ce78918718a9636 /runtime/class_table.cc
parentd6d49e56c2b7b11f474acb80cb02bb1fe9b7861e (diff)
Revert "Hold dex caches live in class table"
This reverts commit d6d49e56c2b7b11f474acb80cb02bb1fe9b7861e. Bug: 29083330 Change-Id: Ie209b27897b8079f2d13fd0837fe5f83a7e61afc
Diffstat (limited to 'runtime/class_table.cc')
-rw-r--r--runtime/class_table.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/class_table.cc b/runtime/class_table.cc
index f5ebcc5191..8267c68b29 100644
--- a/runtime/class_table.cc
+++ b/runtime/class_table.cc
@@ -146,15 +146,15 @@ uint32_t ClassTable::ClassDescriptorHashEquals::operator()(const char* descripto
return ComputeModifiedUtf8Hash(descriptor);
}
-bool ClassTable::InsertStrongRoot(mirror::Object* obj) {
+bool ClassTable::InsertDexFile(mirror::Object* dex_file) {
WriterMutexLock mu(Thread::Current(), lock_);
- DCHECK(obj != nullptr);
- for (GcRoot<mirror::Object>& root : strong_roots_) {
- if (root.Read() == obj) {
+ DCHECK(dex_file != nullptr);
+ for (GcRoot<mirror::Object>& root : dex_files_) {
+ if (root.Read() == dex_file) {
return false;
}
}
- strong_roots_.push_back(GcRoot<mirror::Object>(obj));
+ dex_files_.push_back(GcRoot<mirror::Object>(dex_file));
return true;
}