f more debug when we do a double lock

TheBlueMatt · TheBlueMatt · commit d4597679ffec · 2023-02-26T18:18:53.000Z
diff --git a/lightning/src/sync/debug_sync.rs b/lightning/src/sync/debug_sync.rs
@@ -135,7 +135,12 @@ impl LockMetadata {
 					// instances of the same lock. Still, doing so is quite risky, a total order
 					// must be maintained, and doing so across a set of otherwise-identical mutexes
 					// is fraught with issues.
-					debug_assert!(cfg!(feature = "backtrace") && double_lock_self_allowed, "Tried to acquire a lock while it was held!");
+					#[cfg(feature = "backtrace")]
+					debug_assert!(double_lock_self_allowed,
+						"Tried to acquire a lock while it was held!\nLock constructed at {}",
+						get_construction_location(&this._lock_construction_bt));
+					#[cfg(not(feature = "backtrace"))]
+					panic!("Tried to acquire a lock while it was held!");
 				}
 			}
 			for (locked_idx, locked) in held.borrow().iter() {

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,12 @@ impl LockMetadata {`
`135`	`135`	`// instances of the same lock. Still, doing so is quite risky, a total order`
`136`	`136`	`// must be maintained, and doing so across a set of otherwise-identical mutexes`
`137`	`137`	`// is fraught with issues.`
`138`		`- debug_assert!(cfg!(feature = "backtrace") && double_lock_self_allowed, "Tried to acquire a lock while it was held!");`
	`138`	`+ #[cfg(feature = "backtrace")]`
	`139`	`+ debug_assert!(double_lock_self_allowed,`
	`140`	`+ "Tried to acquire a lock while it was held!\nLock constructed at {}",`
	`141`	`+ get_construction_location(&this._lock_construction_bt));`
	`142`	`+ #[cfg(not(feature = "backtrace"))]`
	`143`	`+ panic!("Tried to acquire a lock while it was held!");`
`139`	`144`	`}`
`140`	`145`	`}`
`141`	`146`	`for (locked_idx, locked) in held.borrow().iter() {`