commit 67ef46adfb2c4990832e23aebeb9c0582d8519c4
author Hiroshi Yamauchi <yamauchi@google.com> Thu Aug 21 15:59:43 2014 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Thu Aug 21 16:00:27 2014 -0700
tree 07f95a8a9c022c547842d43fedd155cbaff4df33
parent ed9fe4ffd9516cfb01b53a3a2c81d3e223ee352c

Avoid handle-less fields in ClassLinker::InitializeClass()

There were some handle-less fields in a SafeMap across GC points.

Bug: 12687968
Change-Id: Ib8c6527d4e23031f1d0074fa11d8f85499b68340

runtime/class_linker.h

diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 5694149..edbf2b3 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -437,8 +437,8 @@
   void AppendToBootClassPath(const DexFile& dex_file, Handle<mirror::DexCache> dex_cache)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
-  void ConstructFieldMap(const DexFile& dex_file, const DexFile::ClassDef& dex_class_def,
-                         mirror::Class* c, SafeMap<uint32_t, mirror::ArtField*>& field_map)
+  void ConstructFieldArray(const DexFile& dex_file, const DexFile::ClassDef& dex_class_def,
+                           mirror::Class* c, Handle<mirror::ObjectArray<mirror::ArtField>> field_array)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
   // Precomputes size needed for Class, in the case of a non-temporary class this size must be