Correct Indicies -> Indices

This is a misspelling that is somewhat common in art/.
Fix up all the instances I could find.

Test: ./test.py --host
Change-Id: I0a5def6e4126cf4e61efb0619bd59eb45ba7f324

9 files changed, 12 insertions, 12 deletions

diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index 023e3a641d..8ac33a4309 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -1099,7 +1099,7 @@ class HBasicBlock : public ArenaObject<kArenaAllocBasicBlock> {
   }
 
   // Insert `this` between `predecessor` and `successor. This method
-  // preserves the indicies, and will update the first edge found between
+  // preserves the indices, and will update the first edge found between
   // `predecessor` and `successor`.
   void InsertBetween(HBasicBlock* predecessor, HBasicBlock* successor) {
     size_t predecessor_index = successor->GetPredecessorIndexOf(predecessor);
diff --git a/dex2oat/dex/dex_to_dex_compiler.cc b/dex2oat/dex/dex_to_dex_compiler.cc
index 23ce37ef1a..de66c1e4e9 100644
--- a/dex2oat/dex/dex_to_dex_compiler.cc
+++ b/dex2oat/dex/dex_to_dex_compiler.cc
@@ -343,7 +343,7 @@ std::vector<uint8_t> DexToDexCompiler::CompilationState::Compile() {
     DCHECK_EQ(quicken_index_, existing_quicken_info_.NumIndices());
   }
 
-  // Even if there are no indicies, generate an empty quicken info so that we know the method was
+  // Even if there are no indices, generate an empty quicken info so that we know the method was
   // quickened.
 
   std::vector<uint8_t> quicken_data;
diff --git a/dex2oat/linker/oat_writer.cc b/dex2oat/linker/oat_writer.cc
index 7368ae42d0..0a26084b80 100644
--- a/dex2oat/linker/oat_writer.cc
+++ b/dex2oat/linker/oat_writer.cc
@@ -2461,7 +2461,7 @@ class OatWriter::WriteQuickeningInfoMethodVisitor {
     return written_bytes_;
   }
 
-  SafeMap<const DexFile*, std::vector<uint32_t>>& GetQuickenInfoOffsetIndicies() {
+  SafeMap<const DexFile*, std::vector<uint32_t>>& GetQuickenInfoOffsetIndices() {
     return quicken_info_offset_indices_;
   }
 
@@ -2572,7 +2572,7 @@ bool OatWriter::WriteQuickeningInfo(OutputStream* vdex_out) {
     WriteQuickeningInfoOffsetsMethodVisitor table_visitor(
         vdex_out,
         quicken_info_offset,
-        &write_quicken_info_visitor.GetQuickenInfoOffsetIndicies(),
+        &write_quicken_info_visitor.GetQuickenInfoOffsetIndices(),
         /*out*/ &table_offsets);
     if (!table_visitor.VisitDexMethods(*dex_files_)) {
       PLOG(ERROR) << "Failed to write the vdex quickening info. File: "
diff --git a/libartbase/base/bit_table_test.cc b/libartbase/base/bit_table_test.cc
index bf32dc6e00..692861a4a9 100644
--- a/libartbase/base/bit_table_test.cc
+++ b/libartbase/base/bit_table_test.cc
@@ -143,10 +143,10 @@ TEST(BitTableTest, TestBitmapTable) {
   BitMemoryWriter<std::vector<uint8_t>> writer(&buffer);
   const uint64_t value = 0xDEADBEEF0BADF00Dull;
   BitmapTableBuilder builder(&allocator);
-  std::multimap<uint64_t, size_t> indicies;  // bitmap -> row.
+  std::multimap<uint64_t, size_t> indices;  // bitmap -> row.
   for (size_t bit_length = 0; bit_length <= BitSizeOf<uint64_t>(); ++bit_length) {
     uint64_t bitmap = value & MaxInt<uint64_t>(bit_length);
-    indicies.emplace(bitmap, builder.Dedup(&bitmap, MinimumBitsToStore(bitmap)));
+    indices.emplace(bitmap, builder.Dedup(&bitmap, MinimumBitsToStore(bitmap)));
   }
   builder.Encode(writer);
   EXPECT_EQ(1 + static_cast<uint32_t>(POPCOUNT(value)), builder.size());
@@ -154,7 +154,7 @@ TEST(BitTableTest, TestBitmapTable) {
   BitMemoryReader reader(buffer.data());
   BitTableBase<1> table(reader);
   EXPECT_EQ(writer.NumberOfWrittenBits(), reader.NumberOfReadBits());
-  for (auto it : indicies) {
+  for (auto it : indices) {
     uint64_t expected = it.first;
     BitMemoryRegion actual = table.GetBitMemoryRegion(it.second);
     EXPECT_GE(actual.size_in_bits(), MinimumBitsToStore(expected));
diff --git a/libdexfile/dex/dex_file_reference.h b/libdexfile/dex/dex_file_reference.h
index 3ac778121a..1c6ba13968 100644
--- a/libdexfile/dex/dex_file_reference.h
+++ b/libdexfile/dex/dex_file_reference.h
@@ -39,7 +39,7 @@ class DexFileReference {
   };
 };
 
-// Default comparators, compares the indicies, not the backing data.
+// Default comparators, compares the indices, not the backing data.
 inline bool operator<(const DexFileReference& a, const DexFileReference& b) {
   return DexFileReference::Comparator()(a, b);
 }
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 4a3b5d14d1..6d091b8ed6 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -4168,7 +4168,7 @@ bool MethodVerifier<kVerifierDebug>::CheckCallSite(uint32_t call_site_idx) {
   }
 
   CallSiteArrayValueIterator it(*dex_file_, dex_file_->GetCallSiteId(call_site_idx));
-  // Check essential arguments are provided. The dex file verifier has verified indicies of the
+  // Check essential arguments are provided. The dex file verifier has verified indices of the
   // main values (method handle, name, method_type).
   static const size_t kRequiredArguments = 3;
   if (it.Size() < kRequiredArguments) {
diff --git a/test/952-invoke-custom/src/TestInvokeCustomWithConcurrentThreads.java b/test/952-invoke-custom/src/TestInvokeCustomWithConcurrentThreads.java
index 2ef7ff7e70..24140465ad 100644
--- a/test/952-invoke-custom/src/TestInvokeCustomWithConcurrentThreads.java
+++ b/test/952-invoke-custom/src/TestInvokeCustomWithConcurrentThreads.java
@@ -43,7 +43,7 @@ public class TestInvokeCustomWithConcurrentThreads extends TestBase implements R
     // Array of counters for how many times each instantiated call site is called
     private static final AtomicInteger[] called = new AtomicInteger[NUMBER_OF_THREADS];
 
-    // Array of call site indicies of which call site a thread invoked
+    // Array of call site indices of which call site a thread invoked
     private static final AtomicInteger[] targetted = new AtomicInteger[NUMBER_OF_THREADS];
 
     // Synchronization barrier all threads will wait on in the bootstrap method.
diff --git a/test/954-invoke-polymorphic-verifier/check b/test/954-invoke-polymorphic-verifier/check
index dc5ddb7fc9..85db5ae918 100755
--- a/test/954-invoke-polymorphic-verifier/check
+++ b/test/954-invoke-polymorphic-verifier/check
@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Strip out temporary file path information and indicies from output.
+# Strip out temporary file path information and indices from output.
 sed -e "s/ [(]declaration of.*//" -e "s/\[0x[0-9A-F]*\] //g" "$2" > "$2.tmp"
 diff --strip-trailing-cr -q "$1" "$2.tmp" >/dev/null
diff --git a/tools/dmtracedump/tracedump.cc b/tools/dmtracedump/tracedump.cc
index 3afee6fdcb..42527c5699 100644
--- a/tools/dmtracedump/tracedump.cc
+++ b/tools/dmtracedump/tracedump.cc
@@ -2332,7 +2332,7 @@ void createDiff(DataKeys* d1, DataKeys* d2) {
   MethodEntry** methods1 = parseMethodEntries(d1);
   MethodEntry** methods2 = parseMethodEntries(d2);
 
-  // sort and assign the indicies
+  // sort and assign the indices
   qsort(methods1, d1->numMethods, sizeof(MethodEntry*), compareElapsedInclusive);
   for (int32_t i = 0; i < d1->numMethods; ++i) {
     methods1[i]->index = i;