Mercurial > hg > truffle

diff src/share/vm/code/nmethod.hpp @ 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/code/nmethod.hpp	Wed Sep 23 23:56:15 2009 -0700
+++ b/src/share/vm/code/nmethod.hpp	Wed Sep 23 23:57:44 2009 -0700
@@ -490,7 +490,8 @@
 
   void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map,
                                      OopClosure* f);
-  void oops_do(OopClosure* f);
+  virtual void oops_do(OopClosure* f) { oops_do(f, false); }
+  void         oops_do(OopClosure* f, bool do_strong_roots_only);
   bool detect_scavenge_root_oops();
   void verify_scavenge_root_oops() PRODUCT_RETURN;