src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp

rev 7807 : [mq]: bcast

@@ -1,8 +1,7 @@
-
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -231,20 +230,17 @@
 
     survivors_empty = young_gen->from_space()->is_empty() &&
                       young_gen->to_space()->is_empty();
     young_gen_empty = eden_empty && survivors_empty;
 
-    BarrierSet* bs = heap->barrier_set();
-    if (bs->is_a(BarrierSet::ModRef)) {
-      ModRefBarrierSet* modBS = (ModRefBarrierSet*)bs;
+    ModRefBarrierSet* modBS = barrier_set_cast<ModRefBarrierSet>(heap->barrier_set());
       MemRegion old_mr = heap->old_gen()->reserved();
       if (young_gen_empty) {
         modBS->clear(MemRegion(old_mr.start(), old_mr.end()));
       } else {
         modBS->invalidate(MemRegion(old_mr.start(), old_mr.end()));
       }
-    }
 
     // Delete metaspaces for unloaded class loaders and clean up loader_data graph
     ClassLoaderDataGraph::purge();
     MetaspaceAux::verify_metrics();