Mercurial > hg > truffle
diff src/share/vm/code/nmethod.cpp @ 11173:6b0fd0964b87
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 |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp Tue Jul 30 13:03:28 2013 -0700 +++ b/src/share/vm/code/nmethod.cpp Wed Jul 31 11:00:54 2013 +0200 @@ -1139,11 +1139,6 @@ metadata_Relocation* reloc = iter.metadata_reloc(); reloc->fix_metadata_relocation(); } - - // There must not be any interfering patches or breakpoints. - assert(!(iter.type() == relocInfo::breakpoint_type - && iter.breakpoint_reloc()->active()), - "no active breakpoint"); } } @@ -2726,7 +2721,8 @@ relocation_begin()-1+ip[1]); for (; ip < index_end; ip++) tty->print_cr(" (%d ?)", ip[0]); - tty->print_cr(" @" INTPTR_FORMAT ": index_size=%d", ip, *ip++); + tty->print_cr(" @" INTPTR_FORMAT ": index_size=%d", ip, *ip); + ip++; tty->print_cr("reloc_end @" INTPTR_FORMAT ":", ip); } }