# HG changeset patch
# User sangheki
# Date 1508380577 25200
# Node ID 28b2dbe488f13402afa00d3e820477f8ac151943
# Parent  e0b35048532ee0521a3ea7e438867cb0094c246f
8189390: Assert in TestOptionsWithRanges.java
Summary: Reinstate error handling in CMS heap creation code
Reviewed-by: stefank, sangheki

diff -r e0b35048532e -r 28b2dbe488f1 src/hotspot/share/gc/cms/cmsHeap.cpp
--- a/src/hotspot/share/gc/cms/cmsHeap.cpp	Wed Oct 18 23:21:37 2017 +0000
+++ b/src/hotspot/share/gc/cms/cmsHeap.cpp	Wed Oct 18 19:36:17 2017 -0700
@@ -47,7 +47,9 @@
   // If we are running CMS, create the collector responsible
   // for collecting the CMS generations.
   assert(collector_policy()->is_concurrent_mark_sweep_policy(), "must be CMS policy");
-  create_cms_collector();
+  if (!create_cms_collector()) {
+    return JNI_ENOMEM;
+  }
 
   return JNI_OK;
 }
@@ -84,7 +86,7 @@
   CMSCollector::print_on_error(st);
 }
 
-void CMSHeap::create_cms_collector() {
+bool CMSHeap::create_cms_collector() {
   assert(old_gen()->kind() == Generation::ConcurrentMarkSweep,
          "Unexpected generation kinds");
   assert(gen_policy()->is_concurrent_mark_sweep_policy(), "Unexpected policy type");
@@ -93,9 +95,14 @@
                      rem_set(),
                      gen_policy()->as_concurrent_mark_sweep_policy());
 
-  if (!collector->completed_initialization()) {
+  if (collector == NULL || !collector->completed_initialization()) {
+    if (collector) {
+      delete collector; // Be nice in embedded situation
+    }
     vm_shutdown_during_initialization("Could not create CMS collector");
+    return false;
   }
+  return true; // success
 }
 
 void CMSHeap::collect(GCCause::Cause cause) {
diff -r e0b35048532e -r 28b2dbe488f1 src/hotspot/share/gc/cms/cmsHeap.hpp
--- a/src/hotspot/share/gc/cms/cmsHeap.hpp	Wed Oct 18 23:21:37 2017 +0000
+++ b/src/hotspot/share/gc/cms/cmsHeap.hpp	Wed Oct 18 19:36:17 2017 -0700
@@ -106,7 +106,7 @@
   )
 
   // Returns success or failure.
-  void create_cms_collector();
+  bool create_cms_collector();
 
   // In support of ExplicitGCInvokesConcurrent functionality
   bool should_do_concurrent_full_gc(GCCause::Cause cause);