diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2015-04-23 16:12:40 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2015-04-23 21:11:40 -0700 |
| commit | 60f63f53c01cb38ca18a815603282e802a6cf918 (patch) | |
| tree | 4f18427401ead0c790e926672957189a0c0a39eb /runtime/class_linker_test.cc | |
| parent | 633a37ece49c5afcf3fa9a89692f07d19c56229b (diff) | |
| download | art-60f63f53c01cb38ca18a815603282e802a6cf918.tar.gz art-60f63f53c01cb38ca18a815603282e802a6cf918.tar.bz2 art-60f63f53c01cb38ca18a815603282e802a6cf918.zip | |
Use the lock word bits for Baker-style read barrier.
This enables the standard object header to be used with the
Baker-style read barrier.
Bug: 19355854
Bug: 12687968
Change-Id: Ie552b6e1dfe30e96cb1d0895bd0dff25f9d7d015
Diffstat (limited to 'runtime/class_linker_test.cc')
| -rw-r--r-- | runtime/class_linker_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 7bee98f8f1..5239d44520 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -479,7 +479,7 @@ struct ObjectOffsets : public CheckOffsets<mirror::Object> { ObjectOffsets() : CheckOffsets<mirror::Object>(false, "Ljava/lang/Object;") { addOffset(OFFSETOF_MEMBER(mirror::Object, klass_), "shadow$_klass_"); addOffset(OFFSETOF_MEMBER(mirror::Object, monitor_), "shadow$_monitor_"); -#ifdef USE_BAKER_OR_BROOKS_READ_BARRIER +#ifdef USE_BROOKS_READ_BARRIER addOffset(OFFSETOF_MEMBER(mirror::Object, x_rb_ptr_), "shadow$_x_rb_ptr_"); addOffset(OFFSETOF_MEMBER(mirror::Object, x_xpadding_), "shadow$_x_xpadding_"); #endif @@ -736,14 +736,14 @@ TEST_F(ClassLinkerTest, FindClass) { EXPECT_FALSE(JavaLangObject->IsSynthetic()); EXPECT_EQ(2U, JavaLangObject->NumDirectMethods()); EXPECT_EQ(11U, JavaLangObject->NumVirtualMethods()); - if (!kUseBakerOrBrooksReadBarrier) { + if (!kUseBrooksReadBarrier) { EXPECT_EQ(2U, JavaLangObject->NumInstanceFields()); } else { EXPECT_EQ(4U, JavaLangObject->NumInstanceFields()); } EXPECT_STREQ(JavaLangObject->GetInstanceField(0)->GetName(), "shadow$_klass_"); EXPECT_STREQ(JavaLangObject->GetInstanceField(1)->GetName(), "shadow$_monitor_"); - if (kUseBakerOrBrooksReadBarrier) { + if (kUseBrooksReadBarrier) { EXPECT_STREQ(JavaLangObject->GetInstanceField(2)->GetName(), "shadow$_x_rb_ptr_"); EXPECT_STREQ(JavaLangObject->GetInstanceField(3)->GetName(), "shadow$_x_xpadding_"); } |