commit ebf6aa8185d59eeaa428b51a7e32ccc2b9ab1daf
author mikaelpeltier <mikaelpeltier@google.com> Wed Nov 07 14:02:15 2012 +0100
committer mikaelpeltier <mikaelpeltier@google.com> Wed Nov 07 14:02:15 2012 +0100
tree 95cf9de07529d58d847898087f8c5fd6c1e1a4fd
parent a0a641c5c47ef37a5d9467582c3dbc4cd3d29529

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

diff --git a/src/dex_file.cc b/src/dex_file.cc
index b7cefe3..4ac80bc 100644
--- a/src/dex_file.cc
+++ b/src/dex_file.cc
@@ -994,7 +994,7 @@
     }
     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_;