*** old/src/share/vm/code/nmethod.cpp	Tue Apr 28 11:53:32 2015
--- new/src/share/vm/code/nmethod.cpp	Tue Apr 28 11:53:32 2015

*** 2985,2999 ****
--- 2985,3000 ----
  void nmethod::print_code_comment_on(outputStream* st, int column, u_char* begin, u_char* end) {
    // First, find an oopmap in (begin, end].
    // We use the odd half-closed interval so that oop maps and scope descs
    // which are tied to the byte after a call are printed with the call itself.
    address base = code_begin();
!   ImmutableOopMapSet* oms = oop_maps();
    if (oms != NULL) {
      for (int i = 0, imax = oms->size(); i < imax; i++) {
!       OopMap* om = oms->at(i);
!       address pc = base + om->offset();
!       const ImmutableOopMapPair* pair = oms->pair_at(i);
!       const ImmutableOopMap* om = pair->get_from(oms);
+       address pc = base + pair->pc();
        if (pc > begin) {
          if (pc <= end) {
            st->move_to(column);
            st->print("; ");
            om->print_on(st);