Skip to content

Commit d8bade2

Browse files
committed
fix some testcase; set correct sender_sp for native frames
1 parent 634a8a9 commit d8bade2

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/hotspot/cpu/s390/abstractInterpreter_s390.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@ void AbstractInterpreter::layout_activation(Method* method,
148148
frame* interpreter_frame,
149149
bool is_top_frame,
150150
bool is_bottom_frame) {
151-
#ifdef ASSERT
152-
guarantee(!caller->is_native_frame(), "should not be here with a native caller");
153-
#endif // ASSERT
154151
// TOP_IJAVA_FRAME:
155152
//
156153
// 0 [TOP_IJAVA_FRAME_ABI] -+
@@ -200,7 +197,8 @@ void AbstractInterpreter::layout_activation(Method* method,
200197
assert(is_bottom_frame && (sender_sp == caller->unextended_sp()),
201198
"must initialize sender_sp of bottom skeleton frame when pushing it");
202199
} else {
203-
assert(caller->is_entry_frame() || caller->is_upcall_stub_frame(), "is there a new frame type??");
200+
// FIXME: sender_sp correctly calculated for native frames ?
201+
assert(caller->is_entry_frame() || caller->is_upcall_stub_frame() || caller->is_native_frame(), "is there a new frame type??");
204202
sender_sp = caller->sp(); // Call_stub only uses it's fp.
205203
}
206204

0 commit comments

Comments
 (0)