f use symbol addr, not instruction pointer, solving inlining issues

Author: TheBlueMatt

lightning/src/debug_sync.rs

@@ -104,25 +104,24 @@ impl LockMetadata {
 
 		#[cfg(feature = "backtrace")]
 		{
-			let mut ip = None;
+			let mut symbol_ptr = None;
 			// Find the first frame which is after `debug_sync` (or which is in our tests) and use
 			// that as the mutex construction site. Note that the first few frames may be in
 			// `backtrace`, so we have to ignore those.
 			let sync_mutex_constr_regex = regex::Regex::new(r"lightning.*debug_sync.*new").unwrap();
 			let mut found_debug_sync = false;
-			for frame in backtrace.frames() {
-				// If a constructor was inlined we should take the frame in which it was inlined
-				// (as its specific to the callsite), thus we look at the last available symbol,
-				// which the `backtrace` docs say will be the caller.
-				let symbol_name = frame.symbols().last().unwrap().name().unwrap().as_str().unwrap();
-				if !sync_mutex_constr_regex.is_match(symbol_name) {
-					if found_debug_sync {
-						ip = Some(frame.ip() as usize as u64);
-						break;
-					}
-				} else { found_debug_sync = true; }
+			'trace_walk: for frame in backtrace.frames() {
+				for symbol in frame.symbols() {
+					let symbol_name = symbol.name().unwrap().as_str().unwrap();
+					if !sync_mutex_constr_regex.is_match(symbol_name) {
+						if found_debug_sync {
+							symbol_ptr = Some(symbol.addr().unwrap() as usize as u64);
+							break 'trace_walk;
+						}
+					} else { found_debug_sync = true; }
+				}
 			}
-			lock_idx = ip.unwrap();
+			lock_idx = symbol_ptr.unwrap();
 			LOCKS_INIT.call_once(|| { unsafe { LOCKS = Some(StdMutex::new(HashMap::new())); } });
 			if let Some(metadata) = unsafe { LOCKS.as_ref() }.unwrap().lock().unwrap().get(&lock_idx) {
 				return Arc::clone(&metadata);