* 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 93b6364806808f6302109dfe83d4d50ee55c54a6..d1265281ca1d4a22e3fc4d66fc70dbf920532d8f 100644 (file)
--- 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 e2b0679d1bc19a57d39837890266c5e805d659e1..e64470862938969bfb4ae711ab235718b91e1da5 100644 (file)
--- 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 ());