diff options
| author | Ian Rogers <irogers@google.com> | 2014-04-28 16:47:08 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-04-29 14:36:28 -0700 |
| commit | b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf (patch) | |
| tree | 839d13ebfa7170967dd9b4abd434b7abda53da99 /runtime/gc/collector/semi_space.h | |
| parent | 948740c1938860df055ddc801f20fd1707331e38 (diff) | |
| download | art-b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf.zip art-b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf.tar.gz art-b0fa5dc7769c1e054032f39de0a3f6d6dd06f8cf.tar.bz2 | |
Force inlining on trivial accessors.
Make volatility for GetFieldObject a template parameter.
Move some trivial mirror::String routines to a -inl.h.
Bug: 14285442
Change-Id: Ie23b11d4f18cb15a62c3bbb42837a8aaf6b68f92
Diffstat (limited to 'runtime/gc/collector/semi_space.h')
| -rw-r--r-- | runtime/gc/collector/semi_space.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/gc/collector/semi_space.h b/runtime/gc/collector/semi_space.h index d468561..9b6df16 100644 --- a/runtime/gc/collector/semi_space.h +++ b/runtime/gc/collector/semi_space.h @@ -21,7 +21,7 @@ #include "base/macros.h" #include "base/mutex.h" #include "garbage_collector.h" -#include "gc/accounting/space_bitmap.h" +#include "gc/accounting/heap_bitmap.h" #include "immune_region.h" #include "object_callbacks.h" #include "offsets.h" @@ -191,7 +191,8 @@ class SemiSpace : public GarbageCollector { void ProcessMarkStack() EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_, Locks::heap_bitmap_lock_); - inline mirror::Object* GetForwardingAddressInFromSpace(mirror::Object* obj) const; + inline mirror::Object* GetForwardingAddressInFromSpace(mirror::Object* obj) const + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); // Revoke all the thread-local buffers. void RevokeAllThreadLocalBuffers(); |