1.1 --- a/src/share/vm/runtime/deoptimization.hpp Thu Dec 11 10:38:17 2014 +0000
1.2 +++ b/src/share/vm/runtime/deoptimization.hpp Tue Nov 25 17:33:59 2014 +0100
1.3 @@ -120,13 +120,14 @@
1.4 static bool realloc_objects(JavaThread* thread, frame* fr, GrowableArray<ScopeValue*>* objects, TRAPS);
1.5 static void reassign_type_array_elements(frame* fr, RegisterMap* reg_map, ObjectValue* sv, typeArrayOop obj, BasicType type);
1.6 static void reassign_object_array_elements(frame* fr, RegisterMap* reg_map, ObjectValue* sv, objArrayOop obj);
1.7 - static void reassign_fields(frame* fr, RegisterMap* reg_map, GrowableArray<ScopeValue*>* objects);
1.8 - static void relock_objects(GrowableArray<MonitorInfo*>* monitors, JavaThread* thread);
1.9 - NOT_PRODUCT(static void print_objects(GrowableArray<ScopeValue*>* objects);)
1.10 + static void reassign_fields(frame* fr, RegisterMap* reg_map, GrowableArray<ScopeValue*>* objects, bool realloc_failures);
1.11 + static void relock_objects(GrowableArray<MonitorInfo*>* monitors, JavaThread* thread, bool realloc_failures);
1.12 + static void pop_frames_failed_reallocs(JavaThread* thread, vframeArray* array);
1.13 + NOT_PRODUCT(static void print_objects(GrowableArray<ScopeValue*>* objects, bool realloc_failures);)
1.14 #endif // COMPILER2
1.15
1.16 public:
1.17 - static vframeArray* create_vframeArray(JavaThread* thread, frame fr, RegisterMap *reg_map, GrowableArray<compiledVFrame*>* chunk);
1.18 + static vframeArray* create_vframeArray(JavaThread* thread, frame fr, RegisterMap *reg_map, GrowableArray<compiledVFrame*>* chunk, bool realloc_failures);
1.19
1.20 // Interface used for unpacking deoptimized frames
1.21
