natVMVirtualMachine.cc (handle_single_step): Use casted pointer in debugging assert.

	* gnu/classpath/jdwp/natVMVirtualMachine.cc (handle_single_step):  Use
	casted pointer in debugging assert.
	(jdwpBreakpointCB):  Likewise.

From-SVN: r146627

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4c40b9358582118499fa5f9c912923c5af81d70f..21abeb19a2f564bb6d195acf0e02414b6691863f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-23  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       * gnu/classpath/jdwp/natVMVirtualMachine.cc (handle_single_step):  Use
+       casted pointer in debugging assert.
+       (jdwpBreakpointCB):  Likewise.
+
 2009-04-09  Jack Howarth  <howarth@bromo.med.uc.edu>
 
        * configure.host: Restore match for darwin9 or later.

diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
index ba123539e17d8dd266d7189681d52703fcbc79bf..7bd300b79c8a9a9f39e9661c1fafbdec6d27e890 100644 (file)
--- a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
+++ b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
@@ -900,9 +900,9 @@ handle_single_step (jvmtiEnv *env, struct step_info *sinfo, jthread thread,
 
   VMMethod *vmmethod = new VMMethod (klass, reinterpret_cast<jlong> (method));
   Location *loc = new Location (vmmethod, location);
-  JvAssert (thread->frame.frame_type == frame_interpreter);
   _Jv_InterpFrame *iframe
     = reinterpret_cast<_Jv_InterpFrame *> (thread->interp_frame);  
+  JvAssert (iframe->frame_type == frame_interpreter);
   jobject instance = iframe->get_this_ptr ();
   event::SingleStepEvent *event
     = new event::SingleStepEvent (thread, loc, instance);
@@ -957,9 +957,9 @@ jdwpBreakpointCB (jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env,
   jlong methodId = reinterpret_cast<jlong> (method);
   VMMethod *meth = VMVirtualMachine::getClassMethod (klass, methodId);
   Location *loc = new Location (meth, location);
-  JvAssert (thread->frame.frame_type == frame_interpreter);
   _Jv_InterpFrame *iframe
     = reinterpret_cast<_Jv_InterpFrame *> (thread->interp_frame);
+  JvAssert (iframe->frame_type == frame_interpreter);
   jobject instance = iframe->get_this_ptr ();
   BreakpointEvent *event = new BreakpointEvent (thread, loc, instance);