diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2015-01-09 14:03:35 -0800 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2015-01-23 14:07:32 -0800 |
| commit | 2cd334ae2d4287216523882f0d298cf3901b7ab1 (patch) | |
| tree | b72d3d07e5a04151caca96cae345075b6e4452b0 /runtime/stack.h | |
| parent | 604e2828896fbb8663897d1e75112da7305ead4c (diff) | |
| download | art-2cd334ae2d4287216523882f0d298cf3901b7ab1.zip art-2cd334ae2d4287216523882f0d298cf3901b7ab1.tar.gz art-2cd334ae2d4287216523882f0d298cf3901b7ab1.tar.bz2 | |
More of the concurrent copying collector.
Bug: 12687968
Change-Id: I62f70274d47df6d6cab714df95c518b750ce3105
Diffstat (limited to 'runtime/stack.h')
| -rw-r--r-- | runtime/stack.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/runtime/stack.h b/runtime/stack.h index 233e1c3..b2b2072 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -24,6 +24,7 @@ #include "dex_file.h" #include "gc_root.h" #include "mirror/object_reference.h" +#include "read_barrier.h" #include "throw_location.h" #include "utils.h" #include "verify_object.h" @@ -163,6 +164,9 @@ class ShadowFrame { const uint32_t* vreg_ptr = &vregs_[i]; ref = reinterpret_cast<const StackReference<mirror::Object>*>(vreg_ptr)->AsMirrorPtr(); } + if (kUseReadBarrier) { + ReadBarrier::AssertToSpaceInvariant(ref); + } if (kVerifyFlags & kVerifyReads) { VerifyObject(ref); } @@ -230,6 +234,9 @@ class ShadowFrame { if (kVerifyFlags & kVerifyWrites) { VerifyObject(val); } + if (kUseReadBarrier) { + ReadBarrier::AssertToSpaceInvariant(val); + } uint32_t* vreg = &vregs_[i]; reinterpret_cast<StackReference<mirror::Object>*>(vreg)->Assign(val); if (HasReferenceArray()) { |