commit 2d53643ca0e05e7c67894aa75eba899acbb9f287
author Ian Pedowitz <ijpedowitz@google.com> Wed Jul 22 14:33:00 2020 -0700
committer Ian Pedowitz <ijpedowitz@google.com> Fri Jul 24 00:41:56 2020 +0000
tree 39299475c04303312f527bc00355bd9fd7a3fad8
parent cefebc86af30522bf79d2a89a2bcf96f7f970ecb

Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 161850439
Bug: 161336379
Test: m -j checkbuild cts docs tests
Change-Id: I32d869c274a5d9a3dac63221e25874fe685d38c4

runtime/elf_file.cc

diff --git a/runtime/elf_file.cc b/runtime/elf_file.cc
index 88992f1..3c6fd85 100644
--- a/runtime/elf_file.cc
+++ b/runtime/elf_file.cc
@@ -549,33 +549,32 @@
 
 template <typename ElfTypes>
 typename ElfTypes::Ehdr& ElfFileImpl<ElfTypes>::GetHeader() const {
-  CHECK(header_ != nullptr);  // Header has been checked in SetMap. This is a sanity check.
+  CHECK(header_ != nullptr);  // Header has been checked in SetMap
   return *header_;
 }
 
 template <typename ElfTypes>
 uint8_t* ElfFileImpl<ElfTypes>::GetProgramHeadersStart() const {
-  CHECK(program_headers_start_ != nullptr);  // Header has been set in Setup. This is a sanity
-                                             // check.
+  CHECK(program_headers_start_ != nullptr);  // Header has been set in Setup
   return program_headers_start_;
 }
 
 template <typename ElfTypes>
 uint8_t* ElfFileImpl<ElfTypes>::GetSectionHeadersStart() const {
   CHECK(!program_header_only_);              // Only used in "full" mode.
-  CHECK(section_headers_start_ != nullptr);  // Is checked in CheckSectionsExist. Sanity check.
+  CHECK(section_headers_start_ != nullptr);  // Is checked in CheckSectionsExist
   return section_headers_start_;
 }
 
 template <typename ElfTypes>
 typename ElfTypes::Phdr& ElfFileImpl<ElfTypes>::GetDynamicProgramHeader() const {
-  CHECK(dynamic_program_header_ != nullptr);  // Is checked in CheckSectionsExist. Sanity check.
+  CHECK(dynamic_program_header_ != nullptr);  // Is checked in CheckSectionsExist
   return *dynamic_program_header_;
 }
 
 template <typename ElfTypes>
 typename ElfTypes::Dyn* ElfFileImpl<ElfTypes>::GetDynamicSectionStart() const {
-  CHECK(dynamic_section_start_ != nullptr);  // Is checked in CheckSectionsExist. Sanity check.
+  CHECK(dynamic_section_start_ != nullptr);  // Is checked in CheckSectionsExist
   return dynamic_section_start_;
 }
 
@@ -678,7 +677,7 @@
 
 template <typename ElfTypes>
 typename ElfTypes::Phdr* ElfFileImpl<ElfTypes>::GetProgramHeader(Elf_Word i) const {
-  CHECK_LT(i, GetProgramHeaderNum()) << file_path_;  // Sanity check for caller.
+  CHECK_LT(i, GetProgramHeaderNum()) << file_path_;  // Validity check for caller.
   uint8_t* program_header = GetProgramHeadersStart() + (i * GetHeader().e_phentsize);
   CHECK_LT(program_header, End());
   return reinterpret_cast<Elf_Phdr*>(program_header);