diff src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents da91efe96a93
children 78bbf4d43a14
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp	Mon Nov 12 18:11:17 2012 +0100
+++ b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp	Mon Nov 12 23:14:12 2012 +0100
@@ -47,15 +47,6 @@
   PSScavenge::invoke();
 }
 
-inline void ParallelScavengeHeap::invoke_full_gc(bool maximum_compaction)
-{
-  if (UseParallelOldGC) {
-    PSParallelCompact::invoke(maximum_compaction);
-  } else {
-    PSMarkSweep::invoke(maximum_compaction);
-  }
-}
-
 inline bool ParallelScavengeHeap::is_in_young(oop p) {
   // Assumes the the old gen address range is lower than that of the young gen.
   const void* loc = (void*) p;
@@ -64,9 +55,4 @@
         err_msg("incorrect test - result=%d, p=" PTR_FORMAT, result, (void*)p));
   return result;
 }
-
-inline bool ParallelScavengeHeap::is_in_old_or_perm(oop p) {
-  return old_gen()->is_in_reserved(p) || perm_gen()->is_in_reserved(p);
-}
-
 #endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP