Mercurial > hg > graal-compiler
changeset 2476:6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
Summary: Allow for one or more fillInStackTrace frames to be skipped
Reviewed-by: mchung, kvn
author | dholmes |
---|---|
date | Tue, 12 Apr 2011 02:53:06 -0400 |
parents | c49c3947b98a |
children | 3449f5e02cc4 c737922fd8bb |
files | src/share/vm/classfile/javaClasses.cpp src/share/vm/classfile/vmSymbols.hpp |
diffstat | 2 files changed, 26 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/javaClasses.cpp Mon Apr 11 11:12:41 2011 +0200 +++ b/src/share/vm/classfile/javaClasses.cpp Tue Apr 12 02:53:06 2011 -0400 @@ -1444,32 +1444,41 @@ } } #ifdef ASSERT - assert(st_method() == method && st.bci() == bci, - "Wrong stack trace"); - st.next(); - // vframeStream::method isn't GC-safe so store off a copy - // of the methodOop in case we GC. - if (!st.at_end()) { - st_method = st.method(); - } + assert(st_method() == method && st.bci() == bci, + "Wrong stack trace"); + st.next(); + // vframeStream::method isn't GC-safe so store off a copy + // of the methodOop in case we GC. + if (!st.at_end()) { + st_method = st.method(); + } #endif + + // the format of the stacktrace will be: + // - 1 or more fillInStackTrace frames for the exception class (skipped) + // - 0 or more <init> methods for the exception class (skipped) + // - rest of the stack + if (!skip_fillInStackTrace_check) { - // check "fillInStackTrace" only once, so we negate the flag - // after the first time check. - skip_fillInStackTrace_check = true; - if (method->name() == vmSymbols::fillInStackTrace_name()) { + if ((method->name() == vmSymbols::fillInStackTrace_name() || + method->name() == vmSymbols::fillInStackTrace0_name()) && + throwable->is_a(method->method_holder())) { continue; } + else { + skip_fillInStackTrace_check = true; // gone past them all + } } - // skip <init> methods of the exceptions klass. If there is <init> methods - // that belongs to a superclass of the exception we are going to skipping - // them in stack trace. This is simlar to classic VM. if (!skip_throwableInit_check) { + assert(skip_fillInStackTrace_check, "logic error in backtrace filtering"); + + // skip <init> methods of the exception class and superclasses + // This is simlar to classic VM. if (method->name() == vmSymbols::object_initializer_name() && throwable->is_a(method->method_holder())) { continue; } else { - // if no "Throwable.init()" method found, we stop checking it next time. + // there are none or we've seen them all - either way stop checking skip_throwableInit_check = true; } }
--- a/src/share/vm/classfile/vmSymbols.hpp Mon Apr 11 11:12:41 2011 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Tue Apr 12 02:53:06 2011 -0400 @@ -330,6 +330,7 @@ template(dispatch_name, "dispatch") \ template(getSystemClassLoader_name, "getSystemClassLoader") \ template(fillInStackTrace_name, "fillInStackTrace") \ + template(fillInStackTrace0_name, "fillInStackTrace0") \ template(getCause_name, "getCause") \ template(initCause_name, "initCause") \ template(setProperty_name, "setProperty") \