diff options
| author | Tomasz Grabiec <tgrabiec@gmail.com> | 2013-03-10 20:47:03 +0100 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2013-03-11 09:43:19 +0200 |
| commit | 236c98248b01617e126a947bda48372aabe99a72 (patch) | |
| tree | 37c51590f21e234f966ac0d501cda9533d200be6 | |
| parent | 043b91f622fb1ce357fe3de9314626c696f44dff (diff) | |
| download | jato-236c98248b01617e126a947bda48372aabe99a72.tar.gz | |
vm: include native trampolines in stack traces
Signed-off-by: Tomasz Grabiec <tgrabiec@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
| -rw-r--r-- | include/vm/stack-trace.h | 2 | ||||
| -rw-r--r-- | test/functional/jvm/StackTraceTest.java | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/vm/stack-trace.h b/include/vm/stack-trace.h index 34af8592..7d56ddc9 100644 --- a/include/vm/stack-trace.h +++ b/include/vm/stack-trace.h @@ -99,9 +99,9 @@ enum stack_trace_elem_type { STACK_TRACE_ELEM_TYPE_JIT, STACK_TRACE_ELEM_TYPE_JNI, STACK_TRACE_ELEM_TYPE_VM_NATIVE, + STACK_TRACE_ELEM_TYPE_TRAMPOLINE, STACK_TRACE_ELEM_TYPE_OTHER, /* All values below this are java */ - STACK_TRACE_ELEM_TYPE_TRAMPOLINE, }; struct stack_trace_elem { diff --git a/test/functional/jvm/StackTraceTest.java b/test/functional/jvm/StackTraceTest.java index e6803356..e73af8ef 100644 --- a/test/functional/jvm/StackTraceTest.java +++ b/test/functional/jvm/StackTraceTest.java @@ -95,9 +95,14 @@ public class StackTraceTest extends TestCase { } assertNotNull(st); - assertEquals(2, st.length); + assertEquals(3, st.length); + + assertStackTraceElement(st[0], -1, null, + "jvm.StackTraceTest", + "nativeMethod", + true); - assertStackTraceElement(st[0], 92, "StackTraceTest.java", + assertStackTraceElement(st[1], 92, "StackTraceTest.java", "jvm.StackTraceTest", "testJNIUnsatisfiedLinkErrorStackTrace", false); |