src/hotspot/share/memory/universe.cpp

*** 116,125 ****
--- 116,126 ----
  
  OopHandle Universe::_the_null_sentinel;
  
  // _out_of_memory_errors is an objArray
  enum OutOfMemoryInstance { _oom_java_heap,
+                            _oom_c_heap,
                             _oom_metaspace,
                             _oom_class_metaspace,
                             _oom_array_size,
                             _oom_gc_overhead_limit,
                             _oom_realloc_objects,
*** 583,592 ****
--- 584,597 ----
  
  oop Universe::out_of_memory_error_java_heap() {
    return gen_out_of_memory_error(out_of_memory_errors()->obj_at(_oom_java_heap));
  }
  
+ oop Universe::out_of_memory_error_c_heap() {
+   return gen_out_of_memory_error(out_of_memory_errors()->obj_at(_oom_c_heap));
+ }
+ 
  oop Universe::out_of_memory_error_metaspace() {
    return gen_out_of_memory_error(out_of_memory_errors()->obj_at(_oom_metaspace));
  }
  
  oop Universe::out_of_memory_error_class_metaspace() {
*** 678,687 ****
--- 683,695 ----
    _out_of_memory_errors = OopHandle(vm_global(), oom_array());
  
    Handle msg = java_lang_String::create_from_str("Java heap space", CHECK);
    java_lang_Throwable::set_message(oom_array->obj_at(_oom_java_heap), msg());
  
+   msg = java_lang_String::create_from_str("C heap space", CHECK);
+   java_lang_Throwable::set_message(oom_array->obj_at(_oom_c_heap), msg());
+ 
    msg = java_lang_String::create_from_str("Metaspace", CHECK);
    java_lang_Throwable::set_message(oom_array->obj_at(_oom_metaspace), msg());
  
    msg = java_lang_String::create_from_str("Compressed class space", CHECK);
    java_lang_Throwable::set_message(oom_array->obj_at(_oom_class_metaspace), msg());
*** 1014,1024 ****
    Universe::_virtual_machine_error_instance = OopHandle(Universe::vm_global(), instance);
  
    Handle msg = java_lang_String::create_from_str("/ by zero", CHECK_false);
    java_lang_Throwable::set_message(Universe::arithmetic_exception_instance(), msg());
  
- 
    Universe::initialize_known_methods(CHECK_false);
  
    // This needs to be done before the first scavenge/gc, since
    // it's an input to soft ref clearing policy.
    {
--- 1022,1031 ----