*** 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

*** 691,701 ****
--- 691,701 ----
      klass = res_type->klass();
      if (res_type->isa_instptr()) {
        // 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);
        assert(klass->is_array_klass() && nfields >= 0, "must be an array klass.");
        elem_type = klass->as_array_klass()->element_type();

*** 722,732 ****
--- 722,732 ----
      // Scan object's fields adding an input to the safepoint for each field.
      for (int j = 0; j < nfields; j++) {
        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();
        } else {
          offset = array_base + j * (intptr_t)element_size;