Merge
authorbrutisso
Thu, 28 Mar 2013 09:07:44 +0100
changeset 16454 7c5cc29e073b
parent 16449 20ce131d6b8c (current diff)
parent 16453 6009860b0b1e (diff)
child 16458 02aac93fe82c
Merge
hotspot/src/share/vm/runtime/arguments.cpp
--- a/hotspot/src/share/vm/runtime/arguments.cpp	Tue Mar 26 15:20:05 2013 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Thu Mar 28 09:07:44 2013 +0100
@@ -1170,7 +1170,6 @@
     set_parnew_gc_flags();
   }
 
-  // MaxHeapSize is aligned down in collectorPolicy
   size_t max_heap = align_size_down(MaxHeapSize,
                                     CardTableRS::ct_max_alignment_constraint());
 
@@ -1208,10 +1207,6 @@
     }
 
     // Code along this path potentially sets NewSize and OldSize
-
-    assert(max_heap >= InitialHeapSize, "Error");
-    assert(max_heap >= NewSize, "Error");
-
     if (PrintGCDetails && Verbose) {
       // Too early to use gclog_or_tty
       tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT