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
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 08ea123..3957493 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -206,8 +206,8 @@
CHECK(java_lang_Class.get() != NULL);
mirror::Class::SetClassClass(java_lang_Class.get());
java_lang_Class->SetClass(java_lang_Class.get());
- if (kUseBrooksPointer) {
- java_lang_Class->AssertSelfBrooksPointer();
+ if (kUseBakerOrBrooksReadBarrier) {
+ java_lang_Class->AssertReadBarrierPointer();
}
java_lang_Class->SetClassSize(sizeof(mirror::ClassClass));
heap->DecrementDisableMovingGC(self);
@@ -1864,8 +1864,8 @@
CHECK(descriptor != NULL);
klass->SetClass(GetClassRoot(kJavaLangClass));
- if (kUseBrooksPointer) {
- klass->AssertSelfBrooksPointer();
+ if (kUseBakerOrBrooksReadBarrier) {
+ klass->AssertReadBarrierPointer();
}
uint32_t access_flags = dex_class_def.access_flags_;
// Make sure that none of our runtime-only flags are set.