diff options
| author | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-30 23:50:03 +0000 |
|---|---|---|
| committer | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-30 23:50:03 +0000 |
| commit | 008e331d0e4f54238ebb063efadb477848f8a426 (patch) | |
| tree | c2080ba5a5023c011534f4bcbf42ebbe01e7c381 /libjava | |
| parent | a7c1e5042e4179f23b72bf99957b4e676157e3e5 (diff) | |
| download | ppe42-gcc-008e331d0e4f54238ebb063efadb477848f8a426.tar.gz ppe42-gcc-008e331d0e4f54238ebb063efadb477848f8a426.zip | |
* stacktrace.cc (_Jv_StackTrace::UpdateNCodeMap): Don't add
interpreted classes.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114253 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/stacktrace.cc | 32 |
2 files changed, 20 insertions, 17 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 24e93cff26d..f47401c9018 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2006-05-31 Alan Modra <amodra@bigpond.net.au> + + * stacktrace.cc (_Jv_StackTrace::UpdateNCodeMap): Don't add + interpreted classes. + 2006-05-30 Thomas Fitzsimmons <fitzsim@redhat.com> * scripts/makemake.tcl (emit_bc_rule): Do not skip diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc index 8b4618172fd..6423bbd8702 100644 --- a/libjava/stacktrace.cc +++ b/libjava/stacktrace.cc @@ -55,23 +55,21 @@ _Jv_StackTrace::UpdateNCodeMap () jclass klass; while ((klass = _Jv_PopClass ())) - { - //printf ("got %s\n", klass->name->data); -#ifdef INTERPRETER - JvAssert (! _Jv_IsInterpretedClass (klass)); -#endif - for (int i=0; i < klass->method_count; i++) - { - _Jv_Method *method = &klass->methods[i]; - void *ncode = method->ncode; - // Add non-abstract methods to ncodeMap. - if (ncode) - { - ncode = UNWRAP_FUNCTION_DESCRIPTOR (ncode); - ncodeMap->put ((java::lang::Object *)ncode, klass); - } - } - } + if (!_Jv_IsInterpretedClass (klass)) + { + //printf ("got %s\n", klass->name->data); + for (int i = 0; i < klass->method_count; i++) + { + _Jv_Method *method = &klass->methods[i]; + void *ncode = method->ncode; + // Add non-abstract methods to ncodeMap. + if (ncode) + { + ncode = UNWRAP_FUNCTION_DESCRIPTOR (ncode); + ncodeMap->put ((java::lang::Object *) ncode, klass); + } + } + } } // Given a native frame, return the class which this code belongs |
