diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-07-22 18:08:23 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-07-29 13:30:46 -0700 |
| commit | 94f7b49578b6aaa80de8ffed230648d601393905 (patch) | |
| tree | cfc69e453faefee38178ceb85378e1f0f1e17812 /runtime/reference_table.h | |
| parent | 8df73882c60451e7f789bf9b1f3db2d7dc228640 (diff) | |
| download | art-94f7b49578b6aaa80de8ffed230648d601393905.tar.gz art-94f7b49578b6aaa80de8ffed230648d601393905.tar.bz2 art-94f7b49578b6aaa80de8ffed230648d601393905.zip | |
Add GcRoot to clean up and enforce read barriers.
Introduce a value-type wrapper around Object* for GC roots so that 1)
we won't have to directly add the read barrier code in many places and
2) we can avoid accidentally bypassing/missing read barriers on GC
roots (the GcRoot interface ensures that the read barrier is executed
on a read).
The jdwp test passed.
Bug: 12687968
Change-Id: Ib167c7c325b3c7e3900133578815f04d219972a1
Diffstat (limited to 'runtime/reference_table.h')
| -rw-r--r-- | runtime/reference_table.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/reference_table.h b/runtime/reference_table.h index 1cd0999f26..876544238a 100644 --- a/runtime/reference_table.h +++ b/runtime/reference_table.h @@ -23,6 +23,7 @@ #include <vector> #include "base/mutex.h" +#include "gc_root.h" #include "object_callbacks.h" namespace art { @@ -50,7 +51,7 @@ class ReferenceTable { void VisitRoots(RootCallback* visitor, void* arg, uint32_t tid, RootType root_type); private: - typedef std::vector<mirror::Object*> Table; + typedef std::vector<GcRoot<mirror::Object>> Table; static void Dump(std::ostream& os, Table& entries) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); friend class IndirectReferenceTable; // For Dump. |