blob: 43f8599e692a0ea6bc8f5fe481cad9753e17b4c9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
# DP: libgcj: Lookup source file name and line number in separated
# DP: debug files found in /usr/lib/debug
---
libjava/stacktrace.cc | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
Index: b/src/libjava/stacktrace.cc
===================================================================
--- a/src/libjava/stacktrace.cc
+++ b/src/libjava/stacktrace.cc
@@ -17,6 +17,11 @@ details. */
#include <java-stack.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include <java/lang/Boolean.h>
#include <java/lang/Class.h>
@@ -260,6 +265,28 @@ _Jv_StackTrace::getLineNumberForFrame(_J
finder->lookup (binaryName, (jlong) offset);
*sourceFileName = finder->getSourceFile();
*lineNum = finder->getLineNum();
+ if (*lineNum == -1 && info.file_name[0] == '/')
+ {
+ const char *debugPrefix = "/usr/lib/debug";
+ char *debugPath = (char *) malloc (strlen(debugPrefix)
+ + strlen(info.file_name)
+ + 2);
+
+ if (debugPath)
+ {
+ strcpy (debugPath, debugPrefix);
+ strcat (debugPath, info.file_name);
+ //printf ("%s: 0x%x\n", debugPath, offset);
+ if (!access (debugPath, R_OK))
+ {
+ binaryName = JvNewStringUTF (debugPath);
+ finder->lookup (binaryName, (jlong) offset);
+ *sourceFileName = finder->getSourceFile();
+ *lineNum = finder->getLineNum();
+ }
+ free (debugPath);
+ }
+ }
if (*lineNum == -1 && NameFinder::showRaw())
{
gnu::gcj::runtime::StringBuffer *t =
|
