--- old/src/share/vm/opto/macro.cpp	Mon Feb 21 14:15:26 2011
+++ new/src/share/vm/opto/macro.cpp	Mon Feb 21 14:15:26 2011
@@ -693,7 +693,7 @@
       // find the fields of the class which will be needed for safepoint debug information
       assert(klass->is_instance_klass(), "must be an instance klass.");
       iklass = klass->as_instance_klass();
-      nfields = iklass->nof_nonstatic_fields();
+      nfields = iklass->nonstatic_fields()->length();
     } else {
       // find the array's elements which will be needed for safepoint debug information
       nfields = alloc->in(AllocateNode::ALength)->find_int_con(-1);
@@ -724,7 +724,7 @@
       intptr_t offset;
       ciField* field = NULL;
       if (iklass != NULL) {
-        field = iklass->nonstatic_field_at(j);
+        field = iklass->nonstatic_fields()->at(j);
         offset = field->offset();
         elem_type = field->type();
         basic_elem_type = field->layout_type();