Mercurial > hg > truffle
diff src/share/vm/runtime/thread.hpp @ 20705:d3f3f7677537
6898462: The escape analysis with G1 cause crash assertion src/share/vm/runtime/vframeArray.cpp:94
Summary: OOM during reallocation of scalar replaced objects in deoptimization causes crashes
Reviewed-by: kvn, jrose
| author | roland |
|---|---|
| date | Tue, 25 Nov 2014 17:33:59 +0100 |
| parents | b12a2a9b05ca |
| children | 7848fc12602b |
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.hpp Thu Dec 11 10:38:17 2014 +0000 +++ b/src/share/vm/runtime/thread.hpp Tue Nov 25 17:33:59 2014 +0100 @@ -933,6 +933,12 @@ // This is set to popframe_pending to signal that top Java frame should be popped immediately int _popframe_condition; + // If reallocation of scalar replaced objects fails, we throw OOM + // and during exception propagation, pop the top + // _frames_to_pop_failed_realloc frames, the ones that reference + // failed reallocations. + int _frames_to_pop_failed_realloc; + #ifndef PRODUCT int _jmp_ring_index; struct { @@ -1585,6 +1591,10 @@ void clr_pop_frame_in_process(void) { _popframe_condition &= ~popframe_processing_bit; } #endif + int frames_to_pop_failed_realloc() const { return _frames_to_pop_failed_realloc; } + void set_frames_to_pop_failed_realloc(int nb) { _frames_to_pop_failed_realloc = nb; } + void dec_frames_to_pop_failed_realloc() { _frames_to_pop_failed_realloc--; } + private: // Saved incoming arguments to popped frame. // Used only when popped interpreted frame returns to deoptimized frame.