From 83f1d02a67d75fc995ee5e6aeddf6e4dd71f23d6 Mon Sep 17 00:00:00 2001
From: John Cuthbertson <johnc@openjdk.org>
Date: Tue, 27 Apr 2010 18:13:47 -0700
Subject: [PATCH] 6946056: assert((intptr_t) sp()<=(intptr_t) result,"result
must>=than stack pointer"), frame_x86.cpp:295
Frame::interpreter_frame_monitor_end() will spuriously assert for a frame that spans 0x80000000. Cast values to intptr_t* (rather than intptr_t) so that an unsigned pointer compare is performed.
Reviewed-by: never, jcoomes, pbk
---
hotspot/src/cpu/x86/vm/frame_x86.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hotspot/src/cpu/x86/vm/frame_x86.cpp b/hotspot/src/cpu/x86/vm/frame_x86.cpp
index 01f49e3dba8..d219e32ef30 100644
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp
@@ -291,8 +291,8 @@ BasicObjectLock* frame::interpreter_frame_monitor_begin() const {
BasicObjectLock* frame::interpreter_frame_monitor_end() const {
BasicObjectLock* result = (BasicObjectLock*) *addr_at(interpreter_frame_monitor_block_top_offset);
// make sure the pointer points inside the frame
- assert((intptr_t) fp() > (intptr_t) result, "result must < than frame pointer");
- assert((intptr_t) sp() <= (intptr_t) result, "result must >= than stack pointer");
+ assert(sp() <= (intptr_t*) result, "monitor end should be above the stack pointer");
+ assert((intptr_t*) result < fp(), "monitor end should be strictly below the frame pointer");
return result;
}