diff options
Diffstat (limited to 'libjava/stacktrace.cc')
| -rw-r--r-- | libjava/stacktrace.cc | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc index 7f967baccf0..77a28644641 100644 --- a/libjava/stacktrace.cc +++ b/libjava/stacktrace.cc @@ -23,7 +23,6 @@ details. */ #include <java/lang/Long.h> #include <java/security/AccessController.h> #include <java/util/ArrayList.h> -#include <java/util/IdentityHashMap.h> #include <gnu/classpath/jdwp/Jdwp.h> #include <gnu/java/lang/MainThread.h> #include <gnu/gcj/runtime/NameFinder.h> @@ -41,7 +40,7 @@ using namespace gnu::gcj::runtime; // NOTE: Currently this Map contradicts class GC for native classes. This map // (and the "new class stack") will need to use WeakReferences in order to // enable native class GC. -static java::util::IdentityHashMap *ncodeMap; +java::util::IdentityHashMap *_Jv_StackTrace::ncodeMap; // Check the "class stack" for any classes initialized since we were last // called, and add them to ncodeMap. @@ -56,21 +55,20 @@ _Jv_StackTrace::UpdateNCodeMap () jclass klass; while ((klass = _Jv_PopClass ())) - 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); - } - } - } + { + //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 @@ -85,7 +83,13 @@ _Jv_StackTrace::ClassForFrame (_Jv_StackFrame *frame) // look it up in ncodeMap if (frame->start_ip) - klass = (jclass) ncodeMap->get ((jobject) frame->start_ip); + { + klass = (jclass) ncodeMap->get ((jobject) frame->start_ip); + + // Exclude interpreted classes + if (klass != NULL && _Jv_IsInterpretedClass (klass)) + klass = NULL; + } return klass; } |