commit 0045a290e6b79a274250e3112880c04bde437d4a
author Ian Rogers <irogers@google.com> Sat Mar 31 21:08:41 2012 -0700
committer Ian Rogers <irogers@google.com> Sat Mar 31 22:38:22 2012 -0700
tree a125d556b6c817218b14f6f3f72079b83d0032c4
parent d23f5206cf72ca3fb53ac3049649bb7d018232bf

Avoid a case of eager initialization.

Don't mark as initialized classes that contain static field
initialization.

Change-Id: Iedcabbdf355e8861eb7731650eee1467f68ae0cd

src/class_linker_test.cc

diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc
index f505d58..6fac6f8 100644
--- a/src/class_linker_test.cc
+++ b/src/class_linker_test.cc
@@ -835,7 +835,7 @@
 TEST_F(ClassLinkerTest, StaticFields) {
   SirtRef<ClassLoader> class_loader(LoadDex("Statics"));
   Class* statics = class_linker_->FindClass("LStatics;", class_loader.get());
-  class_linker_->EnsureInitialized(statics, true);
+  class_linker_->EnsureInitialized(statics, true, true);
 
   // Static final primitives that are initialized by a compile-time constant
   // expression resolve to a copy of a constant value from the constant pool.