OpenJDK / amber / amber
changeset 3828:fa1565f1aa3d
Merge
| author | apetrusenko |
|---|---|
| date | Fri, 25 Sep 2009 04:39:54 -0700 |
| parents | 67b89f5a5cac cef24d2f0baf |
| children | 4903de895f0c 9acd7f9d4f52 97f4f06a7f6d bd61a7ea1907 |
| files | |
| diffstat | 2 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Tue Sep 22 21:12:37 2009 -0600 +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Fri Sep 25 04:39:54 2009 -0700 @@ -2752,7 +2752,6 @@ cm->revisit_klass_stack()->push(k); } -#if ( defined(COMPILER1) || defined(COMPILER2) ) void PSParallelCompact::revisit_mdo(ParCompactionManager* cm, DataLayout* p) { cm->revisit_mdo_stack()->push(p); } @@ -2778,7 +2777,6 @@ follow_stack(cm); } } -#endif // ( COMPILER1 || COMPILER2 ) #ifdef VALIDATE_MARK_SWEEP
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp Tue Sep 22 21:12:37 2009 -0600 +++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp Fri Sep 25 04:39:54 2009 -0700 @@ -73,7 +73,6 @@ follow_stack(); } -#if ( defined(COMPILER1) || defined(COMPILER2) ) void MarkSweep::revisit_mdo(DataLayout* p) { _revisit_mdo_stack->push(p); } @@ -92,7 +91,6 @@ } follow_stack(); } -#endif // ( COMPILER1 || COMPILER2 ) MarkSweep::FollowRootClosure MarkSweep::follow_root_closure;