diff options
author | Mathieu Chartier <mathieuc@google.com> | 2013-09-20 14:02:02 -0700 |
---|---|---|
committer | Mathieu Chartier <mathieuc@google.com> | 2013-09-20 14:02:02 -0700 |
commit | 810b1d704f2db0d935bf5dddae3545f79cabd435 (patch) | |
tree | baf1ec61b47031244cb1fe2458b136c9f9d54f1f /runtime/gc/collector/mark_sweep.h | |
parent | 5c00e28cdc7da675451869a2e5baa8f1c3244892 (diff) | |
parent | bb0140e051e62ca0b51b0870c2386ae3110b0556 (diff) | |
download | art-810b1d704f2db0d935bf5dddae3545f79cabd435.zip art-810b1d704f2db0d935bf5dddae3545f79cabd435.tar.gz art-810b1d704f2db0d935bf5dddae3545f79cabd435.tar.bz2 |
resolved conflicts for merge of bb0140e0 to dalvik-dev
Change-Id: I31e0c05c5e917cf3275296a7f65bd8b78ec9b78b
Diffstat (limited to 'runtime/gc/collector/mark_sweep.h')
-rw-r--r-- | runtime/gc/collector/mark_sweep.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/runtime/gc/collector/mark_sweep.h b/runtime/gc/collector/mark_sweep.h index 52e2bd2..76e71fd 100644 --- a/runtime/gc/collector/mark_sweep.h +++ b/runtime/gc/collector/mark_sweep.h @@ -204,10 +204,6 @@ class MarkSweep : public GarbageCollector { void SweepSystemWeaks() SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); - // Only sweep the weaks which are inside of an allocation stack. - void SweepSystemWeaksArray(accounting::ObjectStack* allocations) - SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); - static mirror::Object* VerifySystemWeakIsLiveCallback(mirror::Object* obj, void* arg) SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); |