diff options
| author | John David Anglin <dave.anglin@nrc-cnrc.gc.ca> | 2005-08-21 23:35:46 +0000 |
|---|---|---|
| committer | John David Anglin <danglin@gcc.gnu.org> | 2005-08-21 23:35:46 +0000 |
| commit | 38fa6e732a96c62c0c07c56d0de384ef6344334a (patch) | |
| tree | 9ead2e8e37898df90435f5ee28bea96680c3469d /libjava | |
| parent | aa5190e9dcae763340b47f6c61bc4c70cae0f904 (diff) | |
| download | gcc-38fa6e732a96c62c0c07c56d0de384ef6344334a.zip gcc-38fa6e732a96c62c0c07c56d0de384ef6344334a.tar.gz gcc-38fa6e732a96c62c0c07c56d0de384ef6344334a.tar.bz2 | |
re PR libgcj/23507 (gij testsuite failures)
PR libgcj/23507
* stacktrace.cc (_Jv_StackTrace::UnwindTraceFn): Fix typo in newLength
assignment. Cast operands of compare to function pointer type.
From-SVN: r103325
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 <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. 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; |