# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1385042666 -3600
# Node ID 790ebab62d23b1901713b94faf0b115192b2304a
# Parent  99769479f9ce8dbcba945b165c7621ffdef933f1
Fix nmethod reloc scanning bug of zombie methods in G1

diff -r 99769479f9ce -r 790ebab62d23 src/share/vm/code/nmethod.cpp
--- a/src/share/vm/code/nmethod.cpp	Fri Nov 15 11:20:18 2013 +0100
+++ b/src/share/vm/code/nmethod.cpp	Thu Nov 21 15:04:26 2013 +0100
@@ -1982,7 +1982,7 @@
   // should not get GC'd.  Skip the first few bytes of oops on
   // not-entrant methods.
   address low_boundary = verified_entry_point();
-  if (is_not_entrant()) {
+  if (is_not_entrant() || is_zombie()) {
     low_boundary += NativeJump::instruction_size;
     // %%% Note:  On SPARC we patch only a 4-byte trap, not a full NativeJump.
     // (See comment above.)