PR libgcj/23507

	* stacktrace.cc (_Jv_StackTrace::UnwindTraceFn): Fix typo in newLength
	assignment.  Cast operands of compare to function pointer type.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@103325 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4adaf58..bc3d8d8 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-21  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+       PR libgcj/23507
+       * stacktrace.cc (_Jv_StackTrace::UnwindTraceFn): Fix typo in newLength
+       assignment.  Cast operands of compare to function pointer type.
+

 2005-08-21  Tom Tromey  <tromey@redhat.com>
 
        * HACKING: Updated for hacking classpath in libgcj.
 2005-08-21  Tom Tromey  <tromey@redhat.com>
 
        * HACKING: Updated for hacking classpath in libgcj.

diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc
index e027678..bc1935f 100644 (file)
--- a/libjava/stacktrace.cc
+++ b/libjava/stacktrace.cc
@@ -102,7 +102,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
   // Check if the trace buffer needs to be extended.
   if (pos == state->length)
     {
   // Check if the trace buffer needs to be extended.
   if (pos == state->length)
     {

-      int newLength = state->length *= 2;
+      int newLength = state->length * 2;

       void *newFrames = _Jv_AllocBytes (newLength * sizeof(_Jv_StackFrame));
       memcpy (newFrames, state->frames, state->length * sizeof(_Jv_StackFrame));      
       state->frames = (_Jv_StackFrame *) newFrames;
       void *newFrames = _Jv_AllocBytes (newLength * sizeof(_Jv_StackFrame));
       memcpy (newFrames, state->frames, state->length * sizeof(_Jv_StackFrame));      
       state->frames = (_Jv_StackFrame *) newFrames;


@@ -117,7 +117,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
   // correspondance between call frames in the interpreted stack and occurances
   // of _Jv_InterpMethod::run() on the native stack.
 #ifdef INTERPRETER
   // correspondance between call frames in the interpreted stack and occurances
   // of _Jv_InterpMethod::run() on the native stack.
 #ifdef INTERPRETER

-  if (func_addr == (_Unwind_Ptr) &_Jv_InterpMethod::run)
+  if ((void (*)(void)) func_addr == (void (*)(void)) &_Jv_InterpMethod::run)

     {
       state->frames[pos].type = frame_interpreter;
       state->frames[pos].interp.meth = state->interp_frame->self;
     {
       state->frames[pos].type = frame_interpreter;
       state->frames[pos].interp.meth = state->interp_frame->self;