commit 1ec37ada3566207b0b39a23eeb8f366cecfee77a
author Narayan Kamath <narayan@google.com> Mon Oct 03 13:09:34 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 03 13:09:34 2016 +0000
tree 9c39a95d1eeac50379821113888ea78541f0ebc6
parent ebeee75e46d173d3803ed7740800c508c9c23580
parent 42b3dd0f94d2da0ec5f42c4cb57eef71dde02c79

Merge "Address review comments for change 25352fc06c84cdab8a2ab."

runtime/class_linker_test.cc

diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 593702d..451b752 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -1328,7 +1328,7 @@
   // This is the MethodType corresponding to the prototype of
   // String MethodTypes# method1(String).
   // Its RType = Ljava/lang/String;
-  // Its PTypes = { Ljava/langString; }
+  // Its PTypes = { Ljava/lang/String; }
   Handle<mirror::MethodType> method1_type = hs.NewHandle(
       class_linker_->ResolveMethodType(dex_file, method1_id.proto_idx_, dex_cache, class_loader));
 

runtime/mirror/dex_cache-inl.h

diff --git a/runtime/mirror/dex_cache-inl.h b/runtime/mirror/dex_cache-inl.h
index 41692da..0fa6d6b 100644
--- a/runtime/mirror/dex_cache-inl.h
+++ b/runtime/mirror/dex_cache-inl.h
@@ -92,7 +92,7 @@
 
 inline void DexCache::SetResolvedMethodType(uint32_t proto_idx, MethodType* resolved) {
   DCHECK(Runtime::Current()->IsMethodHandlesEnabled());
-  DCHECK_LT(proto_idx, NumResolvedMethodTypes());  // NOTE: Unchecked, i.e. not throwing AIOOB.
+  DCHECK_LT(proto_idx, GetDexFile()->NumProtoIds());
 
   GetResolvedMethodTypes()[proto_idx % NumResolvedMethodTypes()].store(
       MethodTypeDexCachePair(resolved, proto_idx), std::memory_order_relaxed);