Mercurial > hg > truffle

comparison 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
comparison
equal deleted inserted replaced
993:54b3b351d6f9 994:753cf9794df9
488 bool can_unload(BoolObjectClosure* is_alive, OopClosure* keep_alive, 488 bool can_unload(BoolObjectClosure* is_alive, OopClosure* keep_alive,
489 oop* root, bool unloading_occurred); 489 oop* root, bool unloading_occurred);
490 490
491 void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, 491 void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map,
492 OopClosure* f); 492 OopClosure* f);
493 void oops_do(OopClosure* f); 493 virtual void oops_do(OopClosure* f) { oops_do(f, false); }
494 void oops_do(OopClosure* f, bool do_strong_roots_only);
494 bool detect_scavenge_root_oops(); 495 bool detect_scavenge_root_oops();
495 void verify_scavenge_root_oops() PRODUCT_RETURN; 496 void verify_scavenge_root_oops() PRODUCT_RETURN;
496 497
497 bool test_set_oops_do_mark(); 498 bool test_set_oops_do_mark();
498 static void oops_do_marking_prologue(); 499 static void oops_do_marking_prologue();