From: bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 24 May 2002 22:31:23 +0000 (+0000)
Subject:         * java/lang/natThrowable.cc (fillInStackTrace): Use "stackTraceBytes",
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a73670ca0b9a9064948bbd5cb3c4c65cf226e7c2;p=thirdparty%2Fgcc.git

    * java/lang/natThrowable.cc (fillInStackTrace): Use "stackTraceBytes",
        not "stackTrace".


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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 93b636480680..d1265281ca1d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-24  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+	* java/lang/natThrowable.cc (fillInStackTrace): Use "stackTraceBytes",
+	not "stackTrace".
+
 2002-05-24  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
 	Merge JDK 1.4 java.security changes from classpath.
diff --git a/libjava/java/lang/natThrowable.cc b/libjava/java/lang/natThrowable.cc
index e2b0679d1bc1..e64470862938 100644
--- a/libjava/java/lang/natThrowable.cc
+++ b/libjava/java/lang/natThrowable.cc
@@ -58,8 +58,8 @@ java::lang::Throwable::fillInStackTrace (void)
   if (n > 0)
     {
       // We copy the array below to deal with alignment issues.
-      stackTrace = JvNewByteArray (n * sizeof p[0]);
-      memcpy (elements (stackTrace), p+1, (n * sizeof p[0]));
+      stackTraceBytes = JvNewByteArray (n * sizeof p[0]);
+      memcpy (elements (stackTraceBytes), p+1, (n * sizeof p[0]));
     }
 
 #endif
@@ -72,12 +72,12 @@ java::lang::Throwable::printRawStackTrace (java::io::PrintWriter *wr)
 {
   wr->println (toString ());
 #ifdef HAVE_BACKTRACE
-  if (!stackTrace)
+  if (!stackTraceBytes)
     return;
 
-  int depth = stackTrace->length / sizeof (void *);
+  int depth = stackTraceBytes->length / sizeof (void *);
   void *p[depth];
-  memcpy (p, elements (stackTrace), sizeof p);
+  memcpy (p, elements (stackTraceBytes), sizeof p);
 
   _Jv_name_finder finder (_Jv_ThisExecutable ());