1.1 --- a/src/share/vm/memory/universe.cpp Thu Dec 11 10:38:17 2014 +0000
1.2 +++ b/src/share/vm/memory/universe.cpp Tue Nov 25 17:33:59 2014 +0100
1.3 @@ -119,6 +119,7 @@
1.4 oop Universe::_out_of_memory_error_class_metaspace = NULL;
1.5 oop Universe::_out_of_memory_error_array_size = NULL;
1.6 oop Universe::_out_of_memory_error_gc_overhead_limit = NULL;
1.7 +oop Universe::_out_of_memory_error_realloc_objects = NULL;
1.8 objArrayOop Universe::_preallocated_out_of_memory_error_array = NULL;
1.9 volatile jint Universe::_preallocated_out_of_memory_error_avail_count = 0;
1.10 bool Universe::_verify_in_progress = false;
1.11 @@ -190,6 +191,7 @@
1.12 f->do_oop((oop*)&_out_of_memory_error_class_metaspace);
1.13 f->do_oop((oop*)&_out_of_memory_error_array_size);
1.14 f->do_oop((oop*)&_out_of_memory_error_gc_overhead_limit);
1.15 + f->do_oop((oop*)&_out_of_memory_error_realloc_objects);
1.16 f->do_oop((oop*)&_preallocated_out_of_memory_error_array);
1.17 f->do_oop((oop*)&_null_ptr_exception_instance);
1.18 f->do_oop((oop*)&_arithmetic_exception_instance);
1.19 @@ -574,7 +576,8 @@
1.20 (throwable() != Universe::_out_of_memory_error_metaspace) &&
1.21 (throwable() != Universe::_out_of_memory_error_class_metaspace) &&
1.22 (throwable() != Universe::_out_of_memory_error_array_size) &&
1.23 - (throwable() != Universe::_out_of_memory_error_gc_overhead_limit));
1.24 + (throwable() != Universe::_out_of_memory_error_gc_overhead_limit) &&
1.25 + (throwable() != Universe::_out_of_memory_error_realloc_objects));
1.26 }
1.27
1.28
1.29 @@ -1044,6 +1047,7 @@
1.30 Universe::_out_of_memory_error_array_size = k_h->allocate_instance(CHECK_false);
1.31 Universe::_out_of_memory_error_gc_overhead_limit =
1.32 k_h->allocate_instance(CHECK_false);
1.33 + Universe::_out_of_memory_error_realloc_objects = k_h->allocate_instance(CHECK_false);
1.34
1.35 // Setup preallocated NullPointerException
1.36 // (this is currently used for a cheap & dirty solution in compiler exception handling)
1.37 @@ -1083,6 +1087,9 @@
1.38 msg = java_lang_String::create_from_str("GC overhead limit exceeded", CHECK_false);
1.39 java_lang_Throwable::set_message(Universe::_out_of_memory_error_gc_overhead_limit, msg());
1.40
1.41 + msg = java_lang_String::create_from_str("Java heap space: failed reallocation of scalar replaced objects", CHECK_false);
1.42 + java_lang_Throwable::set_message(Universe::_out_of_memory_error_realloc_objects, msg());
1.43 +
1.44 msg = java_lang_String::create_from_str("/ by zero", CHECK_false);
1.45 java_lang_Throwable::set_message(Universe::_arithmetic_exception_instance, msg());
1.46
