diff options
| author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-15 21:08:34 +0000 |
|---|---|---|
| committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-15 21:08:34 +0000 |
| commit | 8bb50064b28c64f8c23cec6627942436bb889d13 (patch) | |
| tree | 37ad2532b54c3f0d61a54dd11b502ca5d98c6c65 /libjava | |
| parent | dc55d4444117d0be06ec772e3ddf3ad96f22ede7 (diff) | |
| download | ppe42-gcc-8bb50064b28c64f8c23cec6627942436bb889d13.tar.gz ppe42-gcc-8bb50064b28c64f8c23cec6627942436bb889d13.zip | |
2006-05-15 Andreas Tobler <a.tobler@schweiz.ch>
* stacktrace.cc (StackTrace::FillInFrameInfo): Use
UNWRAP_FUNCTION_DESCRIPTOR to compare frame->start_ip against the
klass->methods[j].ncode.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113801 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/stacktrace.cc | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fc7eddc21a7..21397c17707 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2006-05-15 Andreas Tobler <a.tobler@schweiz.ch> + + * stacktrace.cc (StackTrace::FillInFrameInfo): Use + UNWRAP_FUNCTION_DESCRIPTOR to compare frame->start_ip against the + klass->methods[j].ncode. + 2006-05-13 Tom Tromey <tromey@redhat.com> * sources.am, Makefile.in: Rebuilt. @@ -91,7 +97,7 @@ * testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Add check for HP-UX and add appropriate extension for shared libraries, sl. (gcj_jni_test_one): Likewise. - + * testsuite/lib/libjava.exp (libjava_find_lib): Add sl to the shared library extensions. diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc index 16f944a4a05..cc29be16e29 100644 --- a/libjava/stacktrace.cc +++ b/libjava/stacktrace.cc @@ -1,6 +1,6 @@ // stacktrace.cc - Functions for unwinding & inspecting the call stack. -/* Copyright (C) 2005 Free Software Foundation +/* Copyright (C) 2005, 2006 Free Software Foundation This file is part of libgcj. @@ -243,7 +243,8 @@ _Jv_StackTrace::FillInFrameInfo (_Jv_StackFrame *frame) // Find method in class for (int j = 0; j < klass->method_count; j++) { - if (klass->methods[j].ncode == frame->start_ip) + void *wncode UNWRAP_FUNCTION_DESCRIPTOR (klass->methods[j].ncode); + if (wncode == frame->start_ip) { meth = &klass->methods[j]; break; |
