src/hotspot/share/memory/universe.cpp

*** 111,120 ****
--- 111,121 ----
  oop Universe::_out_of_memory_error_metaspace          = NULL;
  oop Universe::_out_of_memory_error_class_metaspace    = NULL;
  oop Universe::_out_of_memory_error_array_size         = NULL;
  oop Universe::_out_of_memory_error_gc_overhead_limit  = NULL;
  oop Universe::_out_of_memory_error_realloc_objects    = NULL;
+ oop Universe::_out_of_memory_error_retry              = NULL;
  oop Universe::_delayed_stack_overflow_error_message   = NULL;
  objArrayOop Universe::_preallocated_out_of_memory_error_array = NULL;
  volatile jint Universe::_preallocated_out_of_memory_error_avail_count = 0;
  bool Universe::_verify_in_progress                    = false;
  long Universe::verify_flags                           = Universe::Verify_All;
*** 193,202 ****
--- 194,204 ----
    f->do_oop((oop*)&_out_of_memory_error_metaspace);
    f->do_oop((oop*)&_out_of_memory_error_class_metaspace);
    f->do_oop((oop*)&_out_of_memory_error_array_size);
    f->do_oop((oop*)&_out_of_memory_error_gc_overhead_limit);
    f->do_oop((oop*)&_out_of_memory_error_realloc_objects);
+   f->do_oop((oop*)&_out_of_memory_error_retry);
    f->do_oop((oop*)&_delayed_stack_overflow_error_message);
    f->do_oop((oop*)&_preallocated_out_of_memory_error_array);
    f->do_oop((oop*)&_null_ptr_exception_instance);
    f->do_oop((oop*)&_arithmetic_exception_instance);
    f->do_oop((oop*)&_virtual_machine_error_instance);
*** 563,573 ****
    return ((!oopDesc::equals(throwable(), Universe::_out_of_memory_error_java_heap)) &&
            (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_metaspace))  &&
            (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_class_metaspace))  &&
            (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_array_size)) &&
            (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_gc_overhead_limit)) &&
!           (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_realloc_objects)));
  }
  
  
  oop Universe::gen_out_of_memory_error(oop default_err) {
    // generate an out of memory error:
--- 565,576 ----
    return ((!oopDesc::equals(throwable(), Universe::_out_of_memory_error_java_heap)) &&
            (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_metaspace))  &&
            (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_class_metaspace))  &&
            (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_array_size)) &&
            (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_gc_overhead_limit)) &&
!           (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_realloc_objects)) &&
!           (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_retry)));
  }
  
  
  oop Universe::gen_out_of_memory_error(oop default_err) {
    // generate an out of memory error:
*** 972,981 ****
--- 975,985 ----
    Universe::_out_of_memory_error_class_metaspace = ik->allocate_instance(CHECK_false);
    Universe::_out_of_memory_error_array_size = ik->allocate_instance(CHECK_false);
    Universe::_out_of_memory_error_gc_overhead_limit =
      ik->allocate_instance(CHECK_false);
    Universe::_out_of_memory_error_realloc_objects = ik->allocate_instance(CHECK_false);
+   Universe::_out_of_memory_error_retry = ik->allocate_instance(CHECK_false);
  
    // Setup preallocated cause message for delayed StackOverflowError
    if (StackReservedPages > 0) {
      Universe::_delayed_stack_overflow_error_message =
        java_lang_String::create_oop_from_str("Delayed StackOverflowError due to ReservedStackAccess annotated method", CHECK_false);
*** 1017,1026 ****
--- 1021,1033 ----
    java_lang_Throwable::set_message(Universe::_out_of_memory_error_gc_overhead_limit, msg());
  
    msg = java_lang_String::create_from_str("Java heap space: failed reallocation of scalar replaced objects", CHECK_false);
    java_lang_Throwable::set_message(Universe::_out_of_memory_error_realloc_objects, msg());
  
+   msg = java_lang_String::create_from_str("Java heap space: failed retryable allocation", CHECK_false);
+   java_lang_Throwable::set_message(Universe::_out_of_memory_error_retry, msg());
+ 
    msg = java_lang_String::create_from_str("/ by zero", CHECK_false);
    java_lang_Throwable::set_message(Universe::_arithmetic_exception_instance, msg());
  
    // Setup the array of errors that have preallocated backtrace
    k = Universe::_out_of_memory_error_java_heap->klass();