diff src/cpu/x86/vm/frame_x86.inline.hpp @ 1257:7b4415a18c8a

Merge
author kvn
date Fri, 12 Feb 2010 15:27:36 -0800
parents e3a4305c6bc3
children c18cbe5936b8
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.inline.hpp	Thu Feb 11 10:48:10 2010 -0800
+++ b/src/cpu/x86/vm/frame_x86.inline.hpp	Fri Feb 12 15:27:36 2010 -0800
@@ -233,7 +233,8 @@
   } else {
     // sp() may have been extended or shrunk by an adapter.  At least
     // check that we don't fall behind the legal region.
-    assert(last_sp < (intptr_t*) interpreter_frame_monitor_begin(), "bad tos");
+    // For top deoptimized frame last_sp == interpreter_frame_monitor_end.
+    assert(last_sp <= (intptr_t*) interpreter_frame_monitor_end(), "bad tos");
     return last_sp;
   }
 }