Commit f5fa9bc1 by Bryce McKinlay Committed by Bryce McKinlay

natThrowable.cc (fillInStackTrace): Use "stackTraceBytes", not "stackTrace".

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

From-SVN: r53857
parent 90442291
2002-05-24 Bryce McKinlay <bryce@waitaki.otago.ac.nz> 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. Merge JDK 1.4 java.security changes from classpath.
* java/security/AccessControlException.java: Merge from Classpath. * java/security/AccessControlException.java: Merge from Classpath.
......
...@@ -58,8 +58,8 @@ java::lang::Throwable::fillInStackTrace (void) ...@@ -58,8 +58,8 @@ java::lang::Throwable::fillInStackTrace (void)
if (n > 0) if (n > 0)
{ {
// We copy the array below to deal with alignment issues. // We copy the array below to deal with alignment issues.
stackTrace = JvNewByteArray (n * sizeof p[0]); stackTraceBytes = JvNewByteArray (n * sizeof p[0]);
memcpy (elements (stackTrace), p+1, (n * sizeof p[0])); memcpy (elements (stackTraceBytes), p+1, (n * sizeof p[0]));
} }
#endif #endif
...@@ -72,12 +72,12 @@ java::lang::Throwable::printRawStackTrace (java::io::PrintWriter *wr) ...@@ -72,12 +72,12 @@ java::lang::Throwable::printRawStackTrace (java::io::PrintWriter *wr)
{ {
wr->println (toString ()); wr->println (toString ());
#ifdef HAVE_BACKTRACE #ifdef HAVE_BACKTRACE
if (!stackTrace) if (!stackTraceBytes)
return; return;
int depth = stackTrace->length / sizeof (void *); int depth = stackTraceBytes->length / sizeof (void *);
void *p[depth]; void *p[depth];
memcpy (p, elements (stackTrace), sizeof p); memcpy (p, elements (stackTraceBytes), sizeof p);
_Jv_name_finder finder (_Jv_ThisExecutable ()); _Jv_name_finder finder (_Jv_ThisExecutable ());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment