From 6da3b7eed85d90af3dd5b21c06f5fc272699b0c5 Mon Sep 17 00:00:00 2001
From: andrew <unknown>
Date: Wed, 23 Sep 2009 11:36:06 -0700
Subject: [PATCH] 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

---
 .../vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 2 --
 src/share/vm/gc_implementation/shared/markSweep.cpp             | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
index e2480c9c8..8c2d145a5 100644
--- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
@@ -2752,7 +2752,6 @@ PSParallelCompact::revisit_weak_klass_link(ParCompactionManager* cm, Klass* k) {
   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 @@ void PSParallelCompact::follow_mdo_weak_refs() {
     follow_stack(cm);
   }
 }
-#endif //  ( COMPILER1 || COMPILER2 )
 
 
 #ifdef VALIDATE_MARK_SWEEP
diff --git a/src/share/vm/gc_implementation/shared/markSweep.cpp b/src/share/vm/gc_implementation/shared/markSweep.cpp
index a03b6a02a..ea625800d 100644
--- a/src/share/vm/gc_implementation/shared/markSweep.cpp
+++ b/src/share/vm/gc_implementation/shared/markSweep.cpp
@@ -73,7 +73,6 @@ void MarkSweep::follow_weak_klass_links() {
   follow_stack();
 }
 
-#if ( defined(COMPILER1) || defined(COMPILER2) )
 void MarkSweep::revisit_mdo(DataLayout* p) {
   _revisit_mdo_stack->push(p);
 }
@@ -92,7 +91,6 @@ void MarkSweep::follow_mdo_weak_refs() {
   }
   follow_stack();
 }
-#endif //  ( COMPILER1 || COMPILER2 )
 
 MarkSweep::FollowRootClosure  MarkSweep::follow_root_closure;
 
-- 
GitLab