diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-03-31 15:14:47 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-03-31 17:40:21 -0700 |
| commit | 624468cd401cc1ac0dd70c746301e0788a597759 (patch) | |
| tree | b21c389d43e25c3d95208c9d2f3f1bc81355a4e5 /runtime/class_linker_test.cc | |
| parent | cfd5acf281b0c509f86b13d73c6a8dfa3ea9922c (diff) | |
| download | art-624468cd401cc1ac0dd70c746301e0788a597759.tar.gz art-624468cd401cc1ac0dd70c746301e0788a597759.tar.bz2 art-624468cd401cc1ac0dd70c746301e0788a597759.zip | |
Make the support code for read barriers a bit more general.
Add an option for Baker in addition to Brooks.
Bug: 12687968
Change-Id: I8a31db817ff6686c72951b6534f588228e270b11
Diffstat (limited to 'runtime/class_linker_test.cc')
| -rw-r--r-- | runtime/class_linker_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 7eb7b01e65..5b72a4496f 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -452,9 +452,9 @@ struct ObjectOffsets : public CheckOffsets<mirror::Object> { // alphabetical 32-bit offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Object, monitor_), "shadow$_monitor_")); -#ifdef USE_BROOKS_POINTER - offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Object, x_brooks_ptr_), "shadow$_x_brooks_ptr_")); - offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Object, x_padding_), "shadow$_x_padding_")); +#ifdef USE_BAKER_OR_BROOKS_READ_BARRIER + offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Object, x_rb_ptr_), "shadow$_x_rb_ptr_")); + offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Object, x_xpadding_), "shadow$_x_xpadding_")); #endif }; }; @@ -731,7 +731,7 @@ TEST_F(ClassLinkerTest, FindClass) { EXPECT_FALSE(JavaLangObject->IsSynthetic()); EXPECT_EQ(2U, JavaLangObject->NumDirectMethods()); EXPECT_EQ(11U, JavaLangObject->NumVirtualMethods()); - if (!kUseBrooksPointer) { + if (!kUseBakerOrBrooksReadBarrier) { EXPECT_EQ(2U, JavaLangObject->NumInstanceFields()); } else { EXPECT_EQ(4U, JavaLangObject->NumInstanceFields()); @@ -740,11 +740,11 @@ TEST_F(ClassLinkerTest, FindClass) { EXPECT_STREQ(fh.GetName(), "shadow$_klass_"); fh.ChangeField(JavaLangObject->GetInstanceField(1)); EXPECT_STREQ(fh.GetName(), "shadow$_monitor_"); - if (kUseBrooksPointer) { + if (kUseBakerOrBrooksReadBarrier) { fh.ChangeField(JavaLangObject->GetInstanceField(2)); - EXPECT_STREQ(fh.GetName(), "shadow$_x_brooks_ptr_"); + EXPECT_STREQ(fh.GetName(), "shadow$_x_rb_ptr_"); fh.ChangeField(JavaLangObject->GetInstanceField(3)); - EXPECT_STREQ(fh.GetName(), "shadow$_x_padding_"); + EXPECT_STREQ(fh.GetName(), "shadow$_x_xpadding_"); } EXPECT_EQ(0U, JavaLangObject->NumStaticFields()); |