Mercurial > hg > truffle

diff src/share/vm/gc_interface/collectedHeap.hpp @ 5965:cc74fa5a91a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7103665: HeapWord*ParallelScavengeHeap::failed_mem_allocate(unsigned long,bool)+0x97 Summary: Make sure that MutableNUMASpace::ensure_parsability() only calls CollectedHeap::fill_with_object() with valid sizes and make sure CollectedHeap::filler_array_max_size() returns a value that can be converted to an int without overflow Reviewed-by: azeemj, jmasa, iveresov
author brutisso
date Fri, 23 Mar 2012 15:28:24 +0100
parents aa3d708d67c4
children 9a9bb0010c91
line wrap: on
line diff
--- a/src/share/vm/gc_interface/collectedHeap.hpp	Fri Mar 23 10:53:19 2012 -0400
+++ b/src/share/vm/gc_interface/collectedHeap.hpp	Fri Mar 23 15:28:24 2012 +0100
@@ -128,7 +128,6 @@
   // Reinitialize tlabs before resuming mutators.
   virtual void resize_all_tlabs();
 
- protected:
   // Allocate from the current thread's TLAB, with broken-out slow path.
   inline static HeapWord* allocate_from_tlab(Thread* thread, size_t size);
   static HeapWord* allocate_from_tlab_slow(Thread* thread, size_t size);
@@ -169,7 +168,6 @@
   // Filler object utilities.
   static inline size_t filler_array_hdr_size();
   static inline size_t filler_array_min_size();
-  static inline size_t filler_array_max_size();
 
   DEBUG_ONLY(static void fill_args_check(HeapWord* start, size_t words);)
   DEBUG_ONLY(static void zap_filler_array(HeapWord* start, size_t words, bool zap = true);)
@@ -197,6 +195,10 @@
     G1CollectedHeap
   };
 
+  static inline size_t filler_array_max_size() {
+    return _filler_array_max_size;
+  }
+
   virtual CollectedHeap::Name kind() const { return CollectedHeap::Abstract; }
 
   /**