From 2e44f45bb3724dd70001fadd44bdf914c46062e8 Mon Sep 17 00:00:00 2001
From: andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 12 Mar 2005 16:00:38 +0000
Subject: [PATCH] 2005-03-12 Andreas Tobler <a.tobler@schweiz.ch>
* stacktrace.cc (GetCallerInfo): Return nothing in case of
SJLJ_EXCEPTIONS is defined.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96340 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 5 +++++
libjava/stacktrace.cc | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 06c134fadb66..8cf4b5361eed 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-12 Andreas Tobler <a.tobler@schweiz.ch>
+
+ * stacktrace.cc (GetCallerInfo): Return nothing in case of
+ SJLJ_EXCEPTIONS is defined.
+
2005-03-12 Ranjit Mathew <rmathew@hotmail.com>
* testsuite/libjava.jacks/jacks.xfail: Add XFAILs for new JSR-201
diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc
index 0777d903a217..19123e235970 100644
--- a/libjava/stacktrace.cc
+++ b/libjava/stacktrace.cc
@@ -429,7 +429,7 @@ _Jv_StackTrace::GetCallerInfo (jclass checkClass, jclass *caller_class,
if (caller_meth)
*caller_meth = trace_data.foundMeth;
#else
- return NULL;
+ return;
#endif
}
--
GitLab