*** old/src/share/vm/memory/universe.cpp	Tue Mar  8 20:17:59 2011
--- new/src/share/vm/memory/universe.cpp	Tue Mar  8 20:17:59 2011

*** 605,614 ****
--- 605,618 ----
    // Bootstrap problem: all classes gets a mirror (java.lang.Class instance) assigned eagerly,
    // but we cannot do that for classes created before java.lang.Class is loaded. Here we simply
    // walk over permanent objects created so far (mostly classes) and fixup their mirrors. Note
    // that the number of objects allocated at this point is very small.
    assert(SystemDictionary::Class_klass_loaded(), "java.lang.Class should be loaded");
+ 
+   // Cache the start of the static fields
+   instanceMirrorKlass::set_offset_of_static_fields(instanceMirrorKlass::cast(SystemDictionary::Class_klass())->size_helper() << LogHeapWordSize);
+ 
    FixupMirrorClosure blk;
    Universe::heap()->permanent_object_iterate(&blk);
  }