* java/lang/natThrowable.cc (printRawStackTrace): removed.

	(getStackTrace0): new method.
	* java/lang/Throwable.java (CPlusPlusDemangler): removed.
	(printStackTrace(PrintWriter)): replace with pure java implementation.
	(printRawStackTrace): removed.
	(getStackTrace0): new method.
	* java/lang/StackTraceElement.java (toString): add extra whitespace.
	* gcj/javaprims.h: regenerate class list.
	* include/name-finder.h (lookup): new returns StackTraceElement*.
	(method_name, file_name): fields removed.
	(pid2, f2_pipe, b2_pipe, b2_pipe_fd): new fields.
	(~_Jv_name_finder): close new descriptors.
	* name-finder.cc(_Jv_name_finder): setup c++filt helper process.
	(createStackTraceElement): new method.
	(lookup): returns StackTraceElement*, uses createStackTraceElement().


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@55424 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 17 insertions, 22 deletions

diff --git a/libjava/java/lang/natThrowable.cc b/libjava/java/lang/natThrowable.cc
index e6447086293..c2f7d1b8d8d 100644
--- a/libjava/java/lang/natThrowable.cc
+++ b/libjava/java/lang/natThrowable.cc
@@ -22,6 +22,7 @@ details.  */
 #include <java/lang/Object.h>
 #include <java-threads.h>
 #include <java/lang/Throwable.h>
+#include <java/lang/StackTraceElement.h>
 #include <java/io/PrintStream.h>
 #include <java/io/PrintWriter.h>
 #include <java/io/IOException.h>
@@ -67,38 +68,32 @@ java::lang::Throwable::fillInStackTrace (void)
   return this;
 }
 
-void 
-java::lang::Throwable::printRawStackTrace (java::io::PrintWriter *wr)
+JArray<java::lang::StackTraceElement*> *
+java::lang::Throwable::getStackTrace0 ()
 {
-  wr->println (toString ());
 #ifdef HAVE_BACKTRACE
   if (!stackTraceBytes)
-    return;
+    return NULL;
 
   int depth = stackTraceBytes->length / sizeof (void *);
   void *p[depth];
+  // This memcpy is esential; it ensures that the array of void* is
+  // correctly aligned.
   memcpy (p, elements (stackTraceBytes), sizeof p);
 
+  JArray<java::lang::StackTraceElement*> *result;
+  java::lang::StackTraceElement** el;
+  result = reinterpret_cast <JArray<java::lang::StackTraceElement *>*>
+    (JvNewObjectArray (depth, &java::lang::StackTraceElement::class$, NULL));
+  el = elements (result);
+
   _Jv_name_finder finder (_Jv_ThisExecutable ());
 
   for (int i = 0; i < depth; i++)
-    {
-      bool found = finder.lookup (p[i]);
-      wr->print (JvNewStringLatin1 ("   at "));
-      wr->print (JvNewStringLatin1 (finder.hex));
-      if (found)
-	{
-	  wr->print (JvNewStringLatin1 (": "));
-	  wr->print (JvNewStringLatin1 (finder.method_name));
-	  if (finder.file_name[0])
-	    {
-	      wr->print (JvNewStringLatin1 (" ("));
-	      wr->print (JvNewStringLatin1 (finder.file_name));
-	      wr->print (JvNewStringLatin1 (")"));
-	    }
-	}
-      wr->println ();
-    }
+    el[i] = finder.lookup (p[i]);
+
+  return result;
+#else
+  return NULL;
 #endif /* HAVE_BACKTRACE */
-  wr->flush ();
 }