OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

From-SVN: r53857
This commit is contained in:
Bryce McKinlay 2002-05-24 22:31:23 +00:00 committed by Bryce McKinlay
parent 9044229140
commit f5fa9bc199
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -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.

10
libjava/java/lang/natThrowable.cc
View File

@ -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 ());