archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6885169: merge of 4957990 and 6863023 causes conflict on do_nmethods

Browse source 
After mechanically merging changes, some by-hand adjustments are needed.

Reviewed-by: ysr
This commit is contained in:
John R Rose 2009-09-23 23:57:44 -07:00
parent 40d52710f6
commit eb73cf4739
7 changed files with 23 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hotspot/src/share/vm/code/nmethod.hpp
View file

@ -490,7 +490,8 @@ class nmethod : public CodeBlob {
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;