# HG changeset patch
# User twisti
# Date 1270553992 -7200
# Node ID ed4f78aa92825259f0dd2c99a6318cd2785c8363
# Parent  9bb91718aaf2cf802bca0422467e07eb054ac7ce
6940520: CodeCache::scavenge_root_nmethods_do must fix oop relocations
Summary: ScavengeRootsInCode can lead to unfixed code-embedded oops.
Reviewed-by: kvn, never

diff -r 9bb91718aaf2 -r ed4f78aa9282 src/share/vm/code/codeCache.cpp
--- a/src/share/vm/code/codeCache.cpp	Fri Apr 02 15:55:04 2010 -0700
+++ b/src/share/vm/code/codeCache.cpp	Tue Apr 06 13:39:52 2010 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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
@@ -284,9 +284,11 @@
       cur->print_on(tty, is_live ? "scavenge root" : "dead scavenge root"); tty->cr();
     }
 #endif //PRODUCT
-    if (is_live)
+    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.