src/share/vm/memory/universe.cpp

*** 119,128 ****
--- 119,129 ----
  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::_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;
  oop Universe::_null_ptr_exception_instance            = NULL;
  oop Universe::_arithmetic_exception_instance          = NULL;
*** 194,203 ****
--- 195,205 ----
    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*)&_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);
    f->do_oop((oop*)&_main_thread_group);
*** 932,941 ****
--- 934,949 ----
      Universe::_out_of_memory_error_array_size = k_h->allocate_instance(CHECK_false);
      Universe::_out_of_memory_error_gc_overhead_limit =
        k_h->allocate_instance(CHECK_false);
      Universe::_out_of_memory_error_realloc_objects = k_h->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);
+     }
+ 
      // Setup preallocated NullPointerException
      // (this is currently used for a cheap & dirty solution in compiler exception handling)
      k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_NullPointerException(), true, CHECK_false);
      Universe::_null_ptr_exception_instance = InstanceKlass::cast(k)->allocate_instance(CHECK_false);
      // Setup preallocated ArithmeticException