Improve deterministic boot image compilation with CC collector.
Allow deterministic compilation with the read barrier configuration.
Test: Compare boot.art produced by different builds of the same tree.
Bug: 37442966
Change-Id: I6cc0d0d7fdfe4f954765764d9f7f3778b7307028
diff --git a/runtime/gc/heap-inl.h b/runtime/gc/heap-inl.h
index 394e541..f40d3c8 100644
--- a/runtime/gc/heap-inl.h
+++ b/runtime/gc/heap-inl.h
@@ -57,8 +57,8 @@
HandleWrapperObjPtr<mirror::Class> h = hs.NewHandleWrapper(&klass);
self->PoisonObjectPointers();
}
- // Need to check that we arent the large object allocator since the large object allocation code
- // path this function. If we didn't check we would have an infinite loop.
+ // Need to check that we aren't the large object allocator since the large object allocation code
+ // path includes this function. If we didn't check we would have an infinite loop.
ObjPtr<mirror::Object> obj;
if (kCheckLargeObject && UNLIKELY(ShouldAllocLargeObject(klass, byte_count))) {
obj = AllocLargeObject<kInstrumented, PreFenceVisitor>(self, &klass, byte_count,
@@ -199,7 +199,7 @@
} else {
DCHECK(!gc_stress_mode_);
}
- // IsConcurrentGc() isn't known at compile time so we can optimize by not checking it for
+ // IsGcConcurrent() isn't known at compile time so we can optimize by not checking it for
// the BumpPointer or TLAB allocators. This is nice since it allows the entire if statement to be
// optimized out. And for the other allocators, AllocatorMayHaveConcurrentGC is a constant since
// the allocator_type should be constant propagated.