diff options
Diffstat (limited to 'patchoat/patchoat.cc')
| -rw-r--r-- | patchoat/patchoat.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index 986f265b3f..3c8c1a397c 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -747,13 +747,8 @@ void PatchOat::PatchVisitor::operator() (ObjPtr<mirror::Class> cls ATTRIBUTE_UNU void PatchOat::VisitObject(mirror::Object* object) { mirror::Object* copy = RelocatedCopyOf(object); CHECK(copy != nullptr); - if (kUseBakerOrBrooksReadBarrier) { - object->AssertReadBarrierPointer(); - if (kUseBrooksReadBarrier) { - mirror::Object* moved_to = RelocatedAddressOfPointer(object); - copy->SetReadBarrierPointer(moved_to); - DCHECK_EQ(copy->GetReadBarrierPointer(), moved_to); - } + if (kUseBakerReadBarrier) { + object->AssertReadBarrierState(); } PatchOat::PatchVisitor visitor(this, copy); object->VisitReferences<kVerifyNone>(visitor, visitor); @@ -1073,7 +1068,7 @@ static int patchoat_image(TimingLogger& timings, TimingLogger::ScopedTiming pt("patch image and oat", &timings); std::string output_directory = - output_image_filename.substr(0, output_image_filename.find_last_of("/")); + output_image_filename.substr(0, output_image_filename.find_last_of('/')); bool ret = PatchOat::Patch(input_image_location, base_delta, output_directory, isa, &timings); if (kIsDebugBuild) { |