From ebf6aa8185d59eeaa428b51a7e32ccc2b9ab1daf Mon Sep 17 00:00:00 2001
From: mikaelpeltier <mikaelpeltier@google.com>
Date: Wed, 7 Nov 2012 14:02:15 +0100
Subject: Fix bug in static field initialization.

- Field::Set routines take the declaring class even for static field accesses.

Change-Id: I842f47243b576b3d0793d5a47f329c8f9cab0d05
---
 src/dex_file.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/dex_file.cc b/src/dex_file.cc
index b7cefe300b..4ac80bc490 100644
--- a/src/dex_file.cc
+++ b/src/dex_file.cc
@@ -994,7 +994,7 @@ void EncodedStaticFieldValueIterator::ReadValueToField(Field* field) const {
     }
     case kType: {
       Class* resolved = linker_->ResolveType(dex_file_, jval_.i, dex_cache_, class_loader_);
-      field->SetObject(NULL, resolved);
+      field->SetObject(field->GetDeclaringClass(), resolved);
       break;
     }
     default: UNIMPLEMENTED(FATAL) << ": type " << type_;
-- 
cgit v1.2.3-59-g8ed1b