commit 88f365433dd8412a80258847e0b0359b125c06c2
author Brian Carlstrom <bdc@google.com> Tue Oct 16 23:24:21 2012 -0700
committer Brian Carlstrom <bdc@google.com> Wed Oct 17 10:51:25 2012 -0700
tree 9a646f251ca1f64e1718bc47c2f65393db22afaf
parent dc1cd1037bf1b81c55b842b230fcc5f0d1e73003

Add support for Value Format VALUE_TYPE in the encoded_array_item used for initial values of static field references from a class_def_item

Bug: 7356558
Change-Id: I2bef6de9b41605f17518bbcc72907bf5a92c6c26

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 0903781..007b8a6 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -2807,7 +2807,8 @@
   const DexFile::ClassDef* dex_class_def = kh.GetClassDef();
   CHECK(dex_class_def != NULL);
   const DexFile& dex_file = kh.GetDexFile();
-  EncodedStaticFieldValueIterator it(dex_file, dex_cache, this, *dex_class_def);
+  EncodedStaticFieldValueIterator it(dex_file, dex_cache, klass->GetClassLoader(),
+                                     this, *dex_class_def);
 
   if (it.HasNext()) {
     // We reordered the fields, so we need to be able to map the field indexes to the right fields.