A few more inclusive language updates
Based on:
https://source.android.com/setup/contribute/respectful-code
#inclusivefixit
Bug: 161336379
Bug: 161896447
Test: art/test.py --host --64
Change-Id: Ieb9af8f5abde2d2e75a2d490e4d3d5c621859a7c
diff --git a/compiler/optimizing/side_effects_test.cc b/compiler/optimizing/side_effects_test.cc
index cf26e79..268798c 100644
--- a/compiler/optimizing/side_effects_test.cc
+++ b/compiler/optimizing/side_effects_test.cc
@@ -42,7 +42,7 @@
// Helper methods.
//
-void testWriteAndReadSanity(SideEffects write, SideEffects read) {
+void testWriteAndReadEffects(SideEffects write, SideEffects read) {
EXPECT_FALSE(write.DoesNothing());
EXPECT_FALSE(read.DoesNothing());
@@ -67,7 +67,7 @@
}
void testWriteAndReadDependence(SideEffects write, SideEffects read) {
- testWriteAndReadSanity(write, read);
+ testWriteAndReadEffects(write, read);
// Dependence only in one direction.
EXPECT_FALSE(write.MayDependOn(read));
@@ -75,7 +75,7 @@
}
void testNoWriteAndReadDependence(SideEffects write, SideEffects read) {
- testWriteAndReadSanity(write, read);
+ testWriteAndReadEffects(write, read);
// No dependence in any direction.
EXPECT_FALSE(write.MayDependOn(read));
diff --git a/runtime/gc/accounting/atomic_stack.h b/runtime/gc/accounting/atomic_stack.h
index 9431f80..4486798 100644
--- a/runtime/gc/accounting/atomic_stack.h
+++ b/runtime/gc/accounting/atomic_stack.h
@@ -113,7 +113,7 @@
*start_address = begin_ + index;
*end_address = begin_ + new_index;
if (kIsDebugBuild) {
- // Sanity check that the memory is zero.
+ // Check that the memory is zero.
for (int32_t i = index; i < new_index; ++i) {
DCHECK_EQ(begin_[i].AsMirrorPtr(), static_cast<T*>(nullptr))
<< "i=" << i << " index=" << index << " new_index=" << new_index;
diff --git a/runtime/gc/accounting/card_table-inl.h b/runtime/gc/accounting/card_table-inl.h
index df50682..8ad9bc7 100644
--- a/runtime/gc/accounting/card_table-inl.h
+++ b/runtime/gc/accounting/card_table-inl.h
@@ -215,7 +215,7 @@
inline uint8_t* CardTable::CardFromAddr(const void *addr) const {
uint8_t *card_addr = biased_begin_ + (reinterpret_cast<uintptr_t>(addr) >> kCardShift);
- // Sanity check the caller was asking for address covered by the card table
+ // Check that the caller was asking for an address covered by the card table.
DCHECK(IsValidCard(card_addr)) << "addr: " << addr
<< " card_addr: " << reinterpret_cast<void*>(card_addr);
return card_addr;
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index d26c32a..e357b75 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -1501,8 +1501,8 @@
}
}
- // Fixup objects may read fields in the boot image, use the mutator lock here for sanity.
- // Though its probably not required.
+ // Fixup objects may read fields in the boot image so we hold the mutator lock (although it is
+ // probably not required).
TimingLogger::ScopedTiming timing("Fixup objects", &logger);
ScopedObjectAccess soa(Thread::Current());
// Need to update the image to be at the target base.
diff --git a/tools/hiddenapi/hiddenapi.cc b/tools/hiddenapi/hiddenapi.cc
index f6d599f..365dd43 100644
--- a/tools/hiddenapi/hiddenapi.cc
+++ b/tools/hiddenapi/hiddenapi.cc
@@ -187,7 +187,7 @@
GetName() == other.GetName() &&
GetSignature() == other.GetSignature();
- // Sanity checks if they do match.
+ // Soundness check that they do match.
if (equals) {
CHECK_EQ(IsVirtualMethod(), other.IsVirtualMethod());
}