Mercurial > hg > truffle

diff src/share/vm/memory/iterator.cpp @ 994:753cf9794df9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6885169: merge of 4957990 and 6863023 causes conflict on do_nmethods Summary: After mechanically merging changes, some by-hand adjustments are needed. Reviewed-by: ysr
author jrose
date Wed, 23 Sep 2009 23:57:44 -0700
parents 54b3b351d6f9
children a1423fe86a18
line wrap: on
line diff
--- a/src/share/vm/memory/iterator.cpp	Wed Sep 23 23:56:15 2009 -0700
+++ b/src/share/vm/memory/iterator.cpp	Wed Sep 23 23:57:44 2009 -0700
@@ -68,8 +68,8 @@
   }
 }
 
-void CodeBlobToOopClosure::do_newly_marked_nmethod(CodeBlob* cb) {
-  cb->oops_do(_cl);
+void CodeBlobToOopClosure::do_newly_marked_nmethod(nmethod* nm) {
+  nm->oops_do(_cl, /*do_strong_roots_only=*/ true);
 }
 
 void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) {