diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-09-08 13:22:56 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-09-09 14:19:23 -0700 |
| commit | 8a74117cac720239a69e60e734c7044b433fad47 (patch) | |
| tree | 88663982b24ac419886c432b22aebb1387c0039a /runtime/indirect_reference_table.h | |
| parent | 9b2b927f573264c2f0d66b24ceeb361857a41ab3 (diff) | |
| download | art-8a74117cac720239a69e60e734c7044b433fad47.tar.gz art-8a74117cac720239a69e60e734c7044b433fad47.tar.bz2 art-8a74117cac720239a69e60e734c7044b433fad47.zip | |
Address read barrier issue with cl/106467
And tidy/add a check.
Bug: 12687968
Change-Id: If63dc0d9d0a0ce5f2eeb81734ff8f4307865f67d
Diffstat (limited to 'runtime/indirect_reference_table.h')
| -rw-r--r-- | runtime/indirect_reference_table.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/runtime/indirect_reference_table.h b/runtime/indirect_reference_table.h index 562ba1e8df..5291e508a9 100644 --- a/runtime/indirect_reference_table.h +++ b/runtime/indirect_reference_table.h @@ -206,12 +206,10 @@ class IrtIterator { explicit IrtIterator(GcRoot<mirror::Object>* table, size_t i, size_t capacity) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) : table_(table), i_(i), capacity_(capacity) { - SkipNullsAndTombstones(); } IrtIterator& operator++() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { ++i_; - SkipNullsAndTombstones(); return *this; } @@ -225,8 +223,6 @@ class IrtIterator { } private: - void SkipNullsAndTombstones() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - GcRoot<mirror::Object>* const table_; size_t i_; const size_t capacity_; |