infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-21 07:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

8198845: Missing resource mark results disassembling generated code failure in hs error report

Browse Source 
Fixed secondary failure due to missing resource mark while disassembling nmethod

Reviewed-by: coleenp, stuefe, dholmes
This commit is contained in:
Zhengyu Gu 2018-03-04 20:57:46 -05:00
parent d1bd39385f
commit cbaf7f2f81
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/share/utilities/vmError.cpp
View File

@ -29,6 +29,7 @@
#include "compiler/disassembler.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "logging/logConfiguration.hpp"
#include "memory/resourceArea.hpp"
#include "prims/whitebox.hpp"
#include "runtime/arguments.hpp"
#include "runtime/atomic.hpp"
@ -773,7 +774,10 @@ void VMError::report(outputStream* st, bool _verbose) {
if (desc != NULL) {
desc->print_on(st);
Disassembler::decode(desc->begin(), desc->end(), st);
} else {
} else if (_thread != NULL) {
// Disassembling nmethod will incur resource memory allocation,
// only do so when thread is valid.
ResourceMark rm(_thread);
Disassembler::decode(cb, st);
st->cr();
}