From 706d739076de738db545c6fe2444d1ea9b478787 Mon Sep 17 00:00:00 2001 From: danglin Date: Sun, 21 Aug 2005 23:35:46 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 6 ++++++ libjava/stacktrace.cc | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4adaf58..bc3d8d8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-08-21 John David Anglin + + 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 * HACKING: Updated for hacking classpath in libgcj. diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc index e027678..bc1935f 100644 --- 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) { - 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; @@ -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 - 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; -- 2.7.4