Mercurial > hg > graal-jvmci-8

comparison src/share/vm/code/nmethod.cpp @ 11173:6b0fd0964b87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents d55f24eac4b1 7875ea94bea5
children d0aeaf72c7bd
comparison
equal deleted inserted replaced
10912:4ea54634f03e 11173:6b0fd0964b87
1137 reloc->fix_oop_relocation(); 1137 reloc->fix_oop_relocation();
1138 } else if (iter.type() == relocInfo::metadata_type) { 1138 } else if (iter.type() == relocInfo::metadata_type) {
1139 metadata_Relocation* reloc = iter.metadata_reloc(); 1139 metadata_Relocation* reloc = iter.metadata_reloc();
1140 reloc->fix_metadata_relocation(); 1140 reloc->fix_metadata_relocation();
1141 } 1141 }
1142
1143 // There must not be any interfering patches or breakpoints.
1144 assert(!(iter.type() == relocInfo::breakpoint_type
1145 && iter.breakpoint_reloc()->active()),
1146 "no active breakpoint");
1147 } 1142 }
1148 } 1143 }
1149 1144
1150 1145
1151 void nmethod::verify_oop_relocations() { 1146 void nmethod::verify_oop_relocations() {
2724 ip[1], 2719 ip[1],
2725 header_end()+ip[0], 2720 header_end()+ip[0],
2726 relocation_begin()-1+ip[1]); 2721 relocation_begin()-1+ip[1]);
2727 for (; ip < index_end; ip++) 2722 for (; ip < index_end; ip++)
2728 tty->print_cr(" (%d ?)", ip[0]); 2723 tty->print_cr(" (%d ?)", ip[0]);
2729 tty->print_cr(" @" INTPTR_FORMAT ": index_size=%d", ip, *ip++); 2724 tty->print_cr(" @" INTPTR_FORMAT ": index_size=%d", ip, *ip);
2725 ip++;
2730 tty->print_cr("reloc_end @" INTPTR_FORMAT ":", ip); 2726 tty->print_cr("reloc_end @" INTPTR_FORMAT ":", ip);
2731 } 2727 }
2732 } 2728 }
2733 } 2729 }
2734 2730