commit 68ae6ad12e4f89526638f167c380d0b28b3bdeac
author Elliott Hughes <enh@google.com> Tue Jul 21 16:11:30 2020 -0700
committer Elliott Hughes <enh@google.com> Tue Jul 21 16:34:58 2020 -0700
tree e18075751c1f0d08d94d7c6be14e1a18b560b285
parent c79ea239415963d4a38752d0f3efe50531c8e04f

Changes for #inclusivefixit.

Test: treehugger
Change-Id: I7ff0496c5c2792a41781e74634247f55b0548213

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index a41ca09..7cfe87b 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -3168,7 +3168,7 @@
   DEBUG("si->base = %p, si->strtab = %p, si->symtab = %p",
         reinterpret_cast<void*>(base), strtab_, symtab_);
 
-  // Sanity checks.
+  // Validity checks.
   if (relocating_linker && needed_count != 0) {
     DL_ERR("linker cannot have DT_NEEDED dependencies on other libraries");
     return false;

linker/linker_block_allocator_test.cpp

diff --git a/linker/linker_block_allocator_test.cpp b/linker/linker_block_allocator_test.cpp
index 359eefb..6fb2b26 100644
--- a/linker/linker_block_allocator_test.cpp
+++ b/linker/linker_block_allocator_test.cpp
@@ -47,14 +47,14 @@
  * this one has size below allocator cap which is 2*sizeof(void*)
  */
 struct test_struct_small {
-  char dummy_str[5];
+  char str[5];
 };
 
 /*
  * 1009 byte struct (1009 is prime)
  */
 struct test_struct_larger {
-  char dummy_str[1009];
+  char str[1009];
 };
 
 static size_t kPageSize = sysconf(_SC_PAGE_SIZE);
@@ -131,14 +131,14 @@
   allocator.protect_all(PROT_READ);
   allocator.protect_all(PROT_READ | PROT_WRITE);
   // check access
-  page2_ptr->dummy_str[23] = 27;
-  page1_ptr->dummy_str[13] = 11;
+  page2_ptr->str[23] = 27;
+  page1_ptr->str[13] = 11;
 
   allocator.protect_all(PROT_READ);
   fprintf(stderr, "trying to access protected page");
 
   // this should result in segmentation fault
-  page1_ptr->dummy_str[11] = 7;
+  page1_ptr->str[11] = 7;
 }
 
 TEST(linker_allocator, test_protect) {