From fd8693ea29d44f6118ca895af16042d0a34bc3fa Mon Sep 17 00:00:00 2001
From: Rene Gollent <rene@gollent.com>
Date: Sun, 18 May 2014 11:01:17 -0400
Subject: [PATCH] Debugger: Improvements to crash report generator.

- If debug information is available for a given stack frame, show the
corresponding source file path and line number in the crash report.
---
 .../controllers/DebugReportGenerator.cpp      | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/apps/debugger/controllers/DebugReportGenerator.cpp b/src/apps/debugger/controllers/DebugReportGenerator.cpp
index ceabf32005..e89bf7fb4d 100644
--- a/src/apps/debugger/controllers/DebugReportGenerator.cpp
+++ b/src/apps/debugger/controllers/DebugReportGenerator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013, Rene Gollent, rene@gollent.com.
+ * Copyright 2012-2014, Rene Gollent, rene@gollent.com.
  * Distributed under the terms of the MIT License.
  */
 
@@ -490,10 +490,30 @@ DebugReportGenerator::_DumpDebuggedThreadInfo(BString& _output,
 	BString data;
 	for (int32 i = 0; StackFrame* frame = trace->FrameAt(i); i++) {
 		char functionName[512];
-		data.SetToFormat("\t\t%#08" B_PRIx64 "\t%#08" B_PRIx64 "\t%s\n",
-			frame->FrameAddress(), frame->InstructionPointer(),
-			UiUtils::FunctionNameForFrame(frame, functionName,
-				sizeof(functionName)));
+		BString sourcePath;
+
+		target_addr_t ip = frame->InstructionPointer();
+		FunctionInstance* functionInstance;
+		Statement* statement;
+		if (fTeam->GetStatementAtAddress(ip,
+				functionInstance, statement) == B_OK) {
+			BReference<Statement> statementReference(statement, true);
+
+			int32 line = statement->StartSourceLocation().Line();
+			LocatableFile* sourceFile = functionInstance->GetFunction()
+				->SourceFile();
+			if (sourceFile != NULL) {
+				sourceFile->GetPath(sourcePath);
+				sourcePath.SetToFormat("(%s:%" B_PRId32 ")",
+					sourcePath.String(), line);
+			}
+		}
+
+
+		data.SetToFormat("\t\t%#08" B_PRIx64 "\t%#08" B_PRIx64 "\t%s %s\n",
+			frame->FrameAddress(), ip, UiUtils::FunctionNameForFrame(
+				frame, functionName, sizeof(functionName)),
+				sourcePath.String());
 
 		_output << data;