src/share/vm/code/codeCache.cpp

*** 1,7 ****
  /*
!  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright 1997-2010 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 282,294 ****
  #ifndef PRODUCT
      if (TraceScavenge) {
        cur->print_on(tty, is_live ? "scavenge root" : "dead scavenge root"); tty->cr();
      }
  #endif //PRODUCT
!     if (is_live)
        // Perform cur->oops_do(f), maybe just once per nmethod.
        f->do_code_blob(cur);
    }
  
    // Check for stray marks.
    debug_only(verify_perm_nmethods(NULL));
  }
--- 282,296 ----
  #ifndef PRODUCT
      if (TraceScavenge) {
        cur->print_on(tty, is_live ? "scavenge root" : "dead scavenge root"); tty->cr();
      }
  #endif //PRODUCT
!     if (is_live) {
        // Perform cur->oops_do(f), maybe just once per nmethod.
        f->do_code_blob(cur);
+       cur->fix_oop_relocations();
+     }
    }
  
    // Check for stray marks.
    debug_only(verify_perm_nmethods(NULL));
  }