# HG changeset patch # User andrew # Date 1253730966 25200 # Node ID c3c4a1d3801afb7da85e01455c78bf7459d3c2f8 # Parent d7c9544cc141cac190db6ea1c65f7110dd219957 6884552: remove some unnecessary #ifdef's introduced in the fix for 4957990 Summary: Removed the unnecessary #ifdef's which were interfering with the build of the Zero-assembler port Reviewed-by: ysr, jcoomes diff -r d7c9544cc141 -r c3c4a1d3801a src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp --- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Fri Sep 18 06:02:17 2009 -0700 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Wed Sep 23 11:36:06 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 diff -r d7c9544cc141 -r c3c4a1d3801a src/share/vm/gc_implementation/shared/markSweep.cpp --- a/src/share/vm/gc_implementation/shared/markSweep.cpp Fri Sep 18 06:02:17 2009 -0700 +++ b/src/share/vm/gc_implementation/shared/markSweep.cpp Wed Sep 23 11:36:06 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;