Skip to content

Commit 60f59a4

Browse files
committed
8293660: Fix frame::sender_for_compiled_frame frame size assert
Reviewed-by: dlong, kvn
1 parent b3461c1 commit 60f59a4

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ inline frame frame::sender_for_compiled_frame(RegisterMap* map) const {
410410
// in C2 code but it will have been pushed onto the stack. so we
411411
// have to find it relative to the unextended sp
412412

413-
assert(_cb->frame_size() >= 0, "must have non-zero frame size");
413+
assert(_cb->frame_size() > 0, "must have non-zero frame size");
414414
intptr_t* l_sender_sp = (!PreserveFramePointer || _sp_is_trusted) ? unextended_sp() + _cb->frame_size()
415415
: sender_sp();
416416
assert(!_sp_is_trusted || l_sender_sp == real_fp(), "");

src/hotspot/cpu/arm/frame_arm.inline.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ inline frame frame::sender_for_compiled_frame(RegisterMap* map) const {
280280
assert(map != NULL, "map must be set");
281281

282282
// frame owned by optimizing compiler
283-
assert(_cb->frame_size() >= 0, "must have non-zero frame size");
283+
assert(_cb->frame_size() > 0, "must have non-zero frame size");
284284
intptr_t* sender_sp = unextended_sp() + _cb->frame_size();
285285
intptr_t* unextended_sp = sender_sp;
286286

src/hotspot/cpu/riscv/frame_riscv.inline.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ frame frame::sender_for_compiled_frame(RegisterMap* map) const {
359359
// in C2 code but it will have been pushed onto the stack. so we
360360
// have to find it relative to the unextended sp
361361

362-
assert(_cb->frame_size() >= 0, "must have non-zero frame size");
362+
assert(_cb->frame_size() > 0, "must have non-zero frame size");
363363
intptr_t* l_sender_sp = unextended_sp() + _cb->frame_size();
364364
intptr_t* unextended_sp = l_sender_sp;
365365

src/hotspot/cpu/x86/frame_x86.inline.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ inline frame frame::sender_for_compiled_frame(RegisterMap* map) const {
393393
assert(map != NULL, "map must be set");
394394

395395
// frame owned by optimizing compiler
396-
assert(_cb->frame_size() >= 0, "must have non-zero frame size");
396+
assert(_cb->frame_size() > 0, "must have non-zero frame size");
397397
intptr_t* sender_sp = unextended_sp() + _cb->frame_size();
398398
assert(sender_sp == real_fp(), "");
399399

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ private Frame senderForCompiledFrame(AARCH64RegisterMap map, CodeBlob cb) {
392392

393393
// frame owned by optimizing compiler
394394
if (Assert.ASSERTS_ENABLED) {
395-
Assert.that(cb.getFrameSize() >= 0, "must have non-zero frame size");
395+
Assert.that(cb.getFrameSize() > 0, "must have non-zero frame size");
396396
}
397397
Address senderSP = getUnextendedSP().addOffsetTo(cb.getFrameSize());
398398

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ private Frame senderForCompiledFrame(PPC64RegisterMap map, CodeBlob cb) {
345345

346346
// frame owned by optimizing compiler
347347
if (Assert.ASSERTS_ENABLED) {
348-
Assert.that(cb.getFrameSize() >= 0, "must have non-zero frame size");
348+
Assert.that(cb.getFrameSize() > 0, "must have non-zero frame size");
349349
}
350350
Address senderSP = getSenderSP();
351351

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ private Frame senderForCompiledFrame(RISCV64RegisterMap map, CodeBlob cb) {
382382

383383
// frame owned by optimizing compiler
384384
if (Assert.ASSERTS_ENABLED) {
385-
Assert.that(cb.getFrameSize() >= 0, "must have non-zero frame size");
385+
Assert.that(cb.getFrameSize() > 0, "must have non-zero frame size");
386386
}
387387
Address senderSP = getUnextendedSP().addOffsetTo(cb.getFrameSize());
388388

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ private Frame senderForCompiledFrame(X86RegisterMap map, CodeBlob cb) {
380380

381381
// frame owned by optimizing compiler
382382
if (Assert.ASSERTS_ENABLED) {
383-
Assert.that(cb.getFrameSize() >= 0, "must have non-zero frame size");
383+
Assert.that(cb.getFrameSize() > 0, "must have non-zero frame size");
384384
}
385385
Address senderSP = getUnextendedSP().addOffsetTo(cb.getFrameSize());
386386

0 commit comments

Comments
 (0)