Fixed jtregs caused by Throwable.getStackTraceElement by switching to pure-java impl

Author: luchsh

cvm/alt_kernel/src25u/java/lang/Throwable.java

@@ -888,17 +888,6 @@ public void setStackTrace(StackTraceElement[] stackTrace) {
      */
     native int getStackTraceDepth();
 
-    /**
-     * Returns the specified element of the stack trace.
-     *
-     * package-protection for use by SharedSecrets.
-     *
-     * @param index index of the element to return.
-     * @throws IndexOutOfBoundsException if {@code index < 0 ||
-     *         index >= getStackTraceDepth() }
-     */
-    native StackTraceElement getStackTraceElement(int index);
-
     /**
      * Reads a {@code Throwable} from a stream, enforcing
      * well-formedness constraints on fields.  Null entries and

cvm/alt_kernel/src8u/java/lang/System.java

@@ -1273,7 +1273,10 @@ public int getStackTraceDepth(Throwable t) {
                 return t.getStackTraceDepth();
             }
             public StackTraceElement getStackTraceElement(Throwable t, int i) {
-                return t.getStackTraceElement(i);
+                if (t.getStackTrace().length == 0) {
+                  t.fillInStackTrace();
+                }
+                return t.getStackTrace()[i];
             }
             public String newStringUnsafe(char[] chars) {
                 return new String(chars, true);

src/hotspot/share/classfile/javaClasses.cpp

@@ -3173,28 +3173,6 @@ void java_lang_Throwable::fill_in_stack_trace_of_preallocated_backtrace(Handle t
   assert(java_lang_Throwable::unassigned_stacktrace() != nullptr, "not initialized");
 }
 
-#if HOTSPOT_TARGET_CLASSLIB == 8
-oop java_lang_Throwable::get_stack_trace_element(Handle throwable, int index, TRAPS) {
-  if (throwable.is_null()) {
-    THROW_0(vmSymbols::java_lang_NullPointerException());
-  }
-  if (index < 0) {
-    THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL);
-  }
-  int n = depth(throwable());
-  if (n <= 0 || n <= index) {
-    THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL);
-  }
-  // just to avoid introducing j.l.StackFrameInfo to kernel class set.
-  // this should work as long as JVM does not embed an object into another.
-  ObjArrayKlass* arrayKlass = ObjArrayKlass::cast(vmClasses::Object_klass()->array_klass(n, THREAD));
-  objArrayHandle arrh(THREAD, arrayKlass->allocate(n, THREAD));
-  objArrayHandle backtraceh(THREAD, (objArrayOop)java_lang_Throwable::backtrace(throwable()));
-  get_stack_trace_elements(arrh->length(), backtraceh, arrh, THREAD);
-  return arrh->obj_at(index);
-}
-#endif
-
 void java_lang_Throwable::get_stack_trace_elements(int depth, Handle backtrace,
                                                    objArrayHandle stack_trace_array_h, TRAPS) {
 

src/hotspot/share/classfile/javaClasses.hpp

@@ -689,9 +689,6 @@ class java_lang_Throwable: AllStatic {
 
   // Programmatic access to stack trace
   static void get_stack_trace_elements(int depth, Handle backtrace, objArrayHandle stack_trace, TRAPS);
-#if HOTSPOT_TARGET_CLASSLIB == 8
-  static oop  get_stack_trace_element(Handle throwable, int index, TRAPS);
-#endif
 
   // For recreating class initialization error exceptions.
   static Handle create_initialization_error(JavaThread* current, Handle throwable);

src/hotspot/share/include/jvm8.h

@@ -121,9 +121,6 @@ JVM_IsNaN(jdouble d);
 JNIEXPORT jint JNICALL
 JVM_GetStackTraceDepth(JNIEnv *env, jobject throwable);
 
-JNIEXPORT jobject JNICALL
-JVM_GetStackTraceElement(JNIEnv *env, jobject throwable, jint index);
-
 JNIEXPORT void JNICALL
 JVM_InitializeCompiler (JNIEnv *env, jclass compCls);
 
@@ -590,4 +587,4 @@ JVM_GetStackAccessControlContext(JNIEnv *env, jclass cls);
 }
 #endif
 
-#endif // _JAVASOFT_JVM8_H_
+#endif // _JAVASOFT_JVM8_H_

src/hotspot/share/prims/jvm.cpp

@@ -3994,4 +3994,4 @@ JVM_ENTRY(jboolean, JVM_IsPrimitiveClass(JNIEnv *env, jclass cls))
   oop mirror = JNIHandles::resolve_non_null(cls);
   return (jboolean) java_lang_Class::is_primitive(mirror);
 JVM_END
-#endif */
+#endif */

src/hotspot/share/prims/jvm8.cpp

@@ -134,13 +134,6 @@ JVM_ENTRY(jint, JVM_GetStackTraceDepth(JNIEnv *env, jobject throwable))
   return java_lang_Throwable::depth(exception);
 JVM_END
 
-JVM_ENTRY(jobject, JVM_GetStackTraceElement(JNIEnv *env, jobject throwable, jint index))
-  JvmtiVMObjectAllocEventCollector oam; // This ctor (throughout this module) may trigger a safepoint/GC
-  Handle exception(THREAD, JNIHandles::resolve(throwable));
-  oop element = java_lang_Throwable::get_stack_trace_element(exception, index, CHECK_NULL);
-  return JNIHandles::make_local(THREAD, element);
-JVM_END
-
 // java.lang.Compiler ////////////////////////////////////////////////////
 
 // The initial cuts of the HotSpot VM will not support JITs, and all existing

src/java.base/share/native/libjava/Throwable.c

@@ -56,11 +56,4 @@ Java_java_lang_Throwable_getStackTraceDepth(JNIEnv *env, jobject throwable)
 {
     return JVM_GetStackTraceDepth(env, throwable);
 }
-
-JNIEXPORT jobject JNICALL
-Java_java_lang_Throwable_getStackTraceElement(JNIEnv *env,
-                                              jobject throwable, jint index)
-{
-    return JVM_GetStackTraceElement(env, throwable, index);
-}
-#endif
+#endif