stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8240530: CheckUnhandledOops breaks BacktraceBuilder::set_has_hidden_top_frame

Browse Source 
Reviewed-by: coleenp, dholmes
This commit is contained in:
Stefan Karlsson 2020-03-04 15:50:51 +01:00
parent 1c1acb4757
commit 593a05c93a
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hotspot/share/classfile/javaClasses.cpp
View File

@ -2014,10 +2014,8 @@ class BacktraceBuilder: public StackObj {
typeArrayOop _bcis; typeArrayOop _bcis;
objArrayOop _mirrors; objArrayOop _mirrors;
typeArrayOop _names; // Needed to insulate method name against redefinition. typeArrayOop _names; // Needed to insulate method name against redefinition.
// This is set to a java.lang.Boolean(true) if the top frame // True if the top frame of the backtrace is omitted because it shall be hidden.
// of the backtrace is omitted because it shall be hidden. bool _has_hidden_top_frame;
// Else it is null.
oop _has_hidden_top_frame;
int _index; int _index;
NoSafepointVerifier _nsv; NoSafepointVerifier _nsv;
@ -2053,15 +2051,15 @@ class BacktraceBuilder: public StackObj {
assert(names != NULL, "names array should be initialized in backtrace"); assert(names != NULL, "names array should be initialized in backtrace");
return names; return names;
} }
static oop get_has_hidden_top_frame(objArrayHandle chunk) { static bool has_hidden_top_frame(objArrayHandle chunk) {
oop hidden = chunk->obj_at(trace_hidden_offset); oop hidden = chunk->obj_at(trace_hidden_offset);
return hidden; return hidden != NULL;
} }
public: public:
// constructor for new backtrace // constructor for new backtrace
BacktraceBuilder(TRAPS): _head(NULL), _methods(NULL), _bcis(NULL), _mirrors(NULL), _names(NULL), _has_hidden_top_frame(NULL) { BacktraceBuilder(TRAPS): _head(NULL), _methods(NULL), _bcis(NULL), _mirrors(NULL), _names(NULL), _has_hidden_top_frame(false) {
expand(CHECK); expand(CHECK);
_backtrace = Handle(THREAD, _head); _backtrace = Handle(THREAD, _head);
_index = 0; _index = 0;
@ -2072,7 +2070,7 @@ class BacktraceBuilder: public StackObj {
_bcis = get_bcis(backtrace); _bcis = get_bcis(backtrace);
_mirrors = get_mirrors(backtrace); _mirrors = get_mirrors(backtrace);
_names = get_names(backtrace); _names = get_names(backtrace);
_has_hidden_top_frame = get_has_hidden_top_frame(backtrace); _has_hidden_top_frame = has_hidden_top_frame(backtrace);
assert(_methods->length() == _bcis->length() && assert(_methods->length() == _bcis->length() &&
_methods->length() == _mirrors->length() && _methods->length() == _mirrors->length() &&
_mirrors->length() == _names->length(), _mirrors->length() == _names->length(),
@ -2152,19 +2150,17 @@ class BacktraceBuilder: public StackObj {
} }
void set_has_hidden_top_frame(TRAPS) { void set_has_hidden_top_frame(TRAPS) {
if (_has_hidden_top_frame == NULL) { if (!_has_hidden_top_frame) {
// It would be nice to add java/lang/Boolean::TRUE here // It would be nice to add java/lang/Boolean::TRUE here
// to indicate that this backtrace has a hidden top frame. // to indicate that this backtrace has a hidden top frame.
// But this code is used before TRUE is allocated. // But this code is used before TRUE is allocated.
// Therefor let's just use an arbitrary legal oop // Therefore let's just use an arbitrary legal oop
// available right here. We only test for != null // available right here. _methods is a short[].
// anyways. _methods is a short[].
assert(_methods != NULL, "we need a legal oop"); assert(_methods != NULL, "we need a legal oop");
_has_hidden_top_frame = _methods; _has_hidden_top_frame = true;
_head->obj_at_put(trace_hidden_offset, _has_hidden_top_frame); _head->obj_at_put(trace_hidden_offset, _methods);
} }
} }
}; };
struct BacktraceElement : public StackObj { struct BacktraceElement : public StackObj {