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

6848466: frame::frame_size() assertion failure with -XX:+DebugDeoptimization

Browse Source 
Add a RegisterMap* argument to frame::frame_size() to correctly compute the sender frame

Reviewed-by: never
This commit is contained in:
Changpeng Fang 2009-06-05 10:25:39 -07:00
parent 73a6885c23
commit 0429abd38a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp
View File

@ -59,7 +59,7 @@ inline bool frame::is_younger(intptr_t* id) const { assert(this->id() != NULL &&
inline bool frame::is_older(intptr_t* id) const { assert(this->id() != NULL && id != NULL, "NULL frame id");
return this->id() > id ; }
inline int frame::frame_size() const { return sender_sp() - sp(); }
inline int frame::frame_size(RegisterMap* map) const { return sender_sp() - sp(); }
inline intptr_t* frame::link() const { return (intptr_t *)(fp()[FP->sp_offset_in_saved_window()] + STACK_BIAS); }

5
hotspot/src/cpu/x86/vm/frame_x86.cpp
View File

@ -237,9 +237,8 @@ bool frame::is_interpreted_frame() const {
return Interpreter::contains(pc());
}
int frame::frame_size() const {
RegisterMap map(JavaThread::current(), false);
frame sender = this->sender(&map);
int frame::frame_size(RegisterMap* map) const {
frame sender = this->sender(map);
return sender.sp() - sp();
}

2
hotspot/src/share/vm/runtime/frame.hpp
View File

@ -117,7 +117,7 @@ class frame VALUE_OBJ_CLASS_SPEC {
bool can_be_deoptimized() const;
// returns the frame size in stack slots
int frame_size() const;
int frame_size(RegisterMap* map) const;
// returns the sending frame
frame sender(RegisterMap* map) const;

3
hotspot/src/share/vm/runtime/vframe.cpp
View File

@ -559,7 +559,8 @@ void javaVFrame::print_value() const {
}
// Check frame size and print warning if it looks suspiciously large
if (fr().sp() != NULL) {
uint size = fr().frame_size();
RegisterMap map = *register_map();
uint size = fr().frame_size(&map);
#ifdef _LP64
if (size > 8*K) warning("SUSPICIOUSLY LARGE FRAME (%d)", size);
#else