From: Matt Corallo <git@bluematt.me>
Date: Tue, 10 Jan 2023 04:59:36 +0000 (+0000)
Subject: debug symbol match
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=1631ff45a8849dd1e0f2831d015ec54774294ca1;p=rust-lightning

debug symbol match
---

diff --git a/lightning/src/debug_sync.rs b/lightning/src/debug_sync.rs
index b61d1cb55..3cb0f4612 100644
--- a/lightning/src/debug_sync.rs
+++ b/lightning/src/debug_sync.rs
@@ -85,11 +85,11 @@ fn get_construction_location(backtrace: &Backtrace) -> String {
 			if !sync_mutex_constr_regex.is_match(symbol_name) {
 				if found_debug_sync {
 					if let Some(col) = symbol.colno() {
-						return format!("{}:{}:{}", symbol.filename().unwrap().display(), symbol.lineno().unwrap(), col);
+						return format!("{}:{}:{} ({})", symbol.filename().unwrap().display(), symbol.lineno().unwrap(), col, symbol_name);
 					} else {
 						// Windows debug symbols don't support column numbers, so fall back to
 						// line numbers only if no `colno` is available
-						return format!("{}:{}", symbol.filename().unwrap().display(), symbol.lineno().unwrap());
+						return format!("{}:{} ({})", symbol.filename().unwrap().display(), symbol.lineno().unwrap(), symbol_name);
 					}
 				}
 			} else { found_debug_sync = true; }