7174978: NPG: Fix bactrace builder for class redefinition

Remove Method* from backtrace but save version so redefine classes doesn't give inaccurate line numbers.  Removed old Merlin API with duplicate code.

Reviewed-by: dholmes, sspitsyn
This commit is contained in:
Coleen Phillimore 2013-01-17 13:40:31 -05:00
parent 68f3dd76c9
commit e508ba9b0b
12 changed files with 297 additions and 341 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -484,15 +484,6 @@ JVM_ENTRY(void, JVM_FillInStackTrace(JNIEnv *env, jobject receiver))
JVM_END
JVM_ENTRY(void, JVM_PrintStackTrace(JNIEnv *env, jobject receiver, jobject printable))
JVMWrapper("JVM_PrintStackTrace");
// Note: This is no longer used in Merlin, but we still support it for compatibility.
oop exception = JNIHandles::resolve_non_null(receiver);
oop stream = JNIHandles::resolve_non_null(printable);
java_lang_Throwable::print_stack_trace(exception, stream);
JVM_END
JVM_ENTRY(jint, JVM_GetStackTraceDepth(JNIEnv *env, jobject throwable))
JVMWrapper("JVM_GetStackTraceDepth");
oop exception = JNIHandles::resolve(throwable);