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.cc | |
| parent | cfd5acf281b0c509f86b13d73c6a8dfa3ea9922c (diff) | |
| download | art-624468cd401cc1ac0dd70c746301e0788a597759.zip art-624468cd401cc1ac0dd70c746301e0788a597759.tar.gz art-624468cd401cc1ac0dd70c746301e0788a597759.tar.bz2 | |
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.cc')
| -rw-r--r-- | runtime/class_linker.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ void ClassLinker::InitFromCompiler(const std::vector<const DexFile*>& boot_class 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 @@ void ClassLinker::LoadClass(const DexFile& dex_file, 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. |