diff options
| author | 2015-07-13 14:35:43 -0700 | |
|---|---|---|
| committer | 2015-07-14 16:45:27 -0700 | |
| commit | 97509954404d031594b2ecbda607314d169d512e (patch) | |
| tree | bb5371ba90d52e2f561b1dc6959584857cb84683 /runtime/java_vm_ext.cc | |
| parent | c6f3439b67962584cfb764133e192c3317f0e1fc (diff) | |
Clean up GC callbacks to be virtual methods
Change-Id: Ia08034a4e5931c4fcb329c3bd3c4b1f301135735
Diffstat (limited to 'runtime/java_vm_ext.cc')
| -rw-r--r-- | runtime/java_vm_ext.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index 36adbeaa5e..36e3aa3b58 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -766,7 +766,7 @@ void* JavaVMExt::FindCodeForNativeMethod(ArtMethod* m) { return native_method; } -void JavaVMExt::SweepJniWeakGlobals(IsMarkedCallback* callback, void* arg) { +void JavaVMExt::SweepJniWeakGlobals(IsMarkedVisitor* visitor) { MutexLock mu(Thread::Current(), weak_globals_lock_); Runtime* const runtime = Runtime::Current(); for (auto* entry : weak_globals_) { @@ -774,7 +774,7 @@ void JavaVMExt::SweepJniWeakGlobals(IsMarkedCallback* callback, void* arg) { if (!entry->IsNull()) { // Since this is called by the GC, we don't need a read barrier. mirror::Object* obj = entry->Read<kWithoutReadBarrier>(); - mirror::Object* new_obj = callback(obj, arg); + mirror::Object* new_obj = visitor->IsMarked(obj); if (new_obj == nullptr) { new_obj = runtime->GetClearedJniWeakGlobal(); } |