diff options
| author | Bryce McKinlay <bryce@waitaki.otago.ac.nz> | 2002-05-24 22:31:23 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-05-24 23:31:23 +0100 |
| commit | f5fa9bc199eafb2f419d87f8a4eb78a9785e2e2d (patch) | |
| tree | 990ec26648302dc72c233992863a81719234705a /libjava | |
| parent | 904422914077869b678ef73e8bd4cf9e165cb7f7 (diff) | |
| download | gcc-f5fa9bc199eafb2f419d87f8a4eb78a9785e2e2d.zip gcc-f5fa9bc199eafb2f419d87f8a4eb78a9785e2e2d.tar.gz gcc-f5fa9bc199eafb2f419d87f8a4eb78a9785e2e2d.tar.bz2 | |
natThrowable.cc (fillInStackTrace): Use "stackTraceBytes", not "stackTrace".
* java/lang/natThrowable.cc (fillInStackTrace): Use "stackTraceBytes",
not "stackTrace".
From-SVN: r53857
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natThrowable.cc | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 93b6364..d126528 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 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. * java/security/AccessControlException.java: Merge from Classpath. diff --git a/libjava/java/lang/natThrowable.cc b/libjava/java/lang/natThrowable.cc index e2b0679..e644708 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 ()); |