diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-04-04 04:34:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-04 04:34:09 +0000 |
| commit | 541dd231f9a7282f7fd1092349a322dc67bafaf2 (patch) | |
| tree | 3c60f49a1e13e48f71f33f2a41cfca1dd54edfed /runtime/gc | |
| parent | e9236f03d8c4348a8f1a8767baa1aea60ecdc1f5 (diff) | |
| parent | 800ac2defde5d12b2f1f313c6b6162560cfa6fc7 (diff) | |
| download | art-541dd231f9a7282f7fd1092349a322dc67bafaf2.zip art-541dd231f9a7282f7fd1092349a322dc67bafaf2.tar.gz art-541dd231f9a7282f7fd1092349a322dc67bafaf2.tar.bz2 | |
Merge "Insert an empty read barrier call."
Diffstat (limited to 'runtime/gc')
| -rw-r--r-- | runtime/gc/space/space_test.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/runtime/gc/space/space_test.h b/runtime/gc/space/space_test.h index 5c735df..9896a48 100644 --- a/runtime/gc/space/space_test.h +++ b/runtime/gc/space/space_test.h @@ -85,8 +85,13 @@ class SpaceTest : public CommonRuntimeTest { EXPECT_GE(size, SizeOfZeroLengthByteArray()); EXPECT_TRUE(byte_array_class != nullptr); o->SetClass(byte_array_class); - if (kUseBrooksReadBarrier) { - o->SetReadBarrierPointer(o); + if (kUseBakerOrBrooksReadBarrier) { + // Like the proper heap object allocation, install and verify + // the correct read barrier pointer. + if (kUseBrooksReadBarrier) { + o->SetReadBarrierPointer(o); + } + o->AssertReadBarrierPointer(); } mirror::Array* arr = o->AsArray<kVerifyNone>(); size_t header_size = SizeOfZeroLengthByteArray(); |