Mercurial > hg > truffle

comparison 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
comparison
equal deleted inserted replaced
993:54b3b351d6f9 994:753cf9794df9
66 } else { 66 } else {
67 NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, skipped on 2nd visit\n")); 67 NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, skipped on 2nd visit\n"));
68 } 68 }
69 } 69 }
70 70
71 void CodeBlobToOopClosure::do_newly_marked_nmethod(CodeBlob* cb) { 71 void CodeBlobToOopClosure::do_newly_marked_nmethod(nmethod* nm) {
72 cb->oops_do(_cl); 72 nm->oops_do(_cl, /*do_strong_roots_only=*/ true);
73 } 73 }
74 74
75 void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) { 75 void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) {
76 if (!_do_marking) { 76 if (!_do_marking) {
77 NOT_PRODUCT(if (TraceScavenge && Verbose && cb->is_nmethod()) ((nmethod*)cb)->print_on(tty, "oops_do, unmarked visit\n")); 77 NOT_PRODUCT(if (TraceScavenge && Verbose && cb->is_nmethod()) ((nmethod*)cb)->print_on(tty, "oops_do, unmarked visit\n"));