f further, make lockdep trace non-Option

Author: TheBlueMatt

lightning/src/debug_sync.rs

@@ -68,14 +68,7 @@ struct LockMetadata {
 
 struct LockDep {
 	lock: Arc<LockMetadata>,
-	lockdep_trace: Option<Backtrace>,
-}
-impl LockDep {
-	/// Note that `Backtrace::new()` is rather expensive so we rely on the caller to fill in the
-	/// `lockdep_backtrace` field after ensuring we need it.
-	fn new_without_bt(lock: &Arc<LockMetadata>) -> Self {
-		Self { lock: Arc::clone(lock), lockdep_trace: None }
-	}
+	lockdep_trace: Backtrace,
 }
 
 #[cfg(feature = "backtrace")]
@@ -160,9 +153,8 @@ impl LockMetadata {
 				}
 				// Insert any already-held locks in our locked-before set.
 				let mut locked_before = this.locked_before.lock().unwrap();
-				let mut lockdep = LockDep::new_without_bt(locked);
-				if !locked_before.contains_key(&lockdep.lock.lock_idx) {
-					lockdep.lockdep_trace = Some(Backtrace::new());
+				if !locked_before.contains_key(&locked.lock_idx) {
+					let lockdep = LockDep { lock: Arc::clone(locked), lockdep_trace: Backtrace::new() };
 					locked_before.insert(lockdep.lock.lock_idx, lockdep);
 				}
 			}
@@ -182,9 +174,8 @@ impl LockMetadata {
 			// succeeds, we do consider it to have created lockorder dependencies.
 			let mut locked_before = this.locked_before.lock().unwrap();
 			for (locked_idx, locked) in held.borrow().iter() {
-				let mut lockdep = LockDep::new_without_bt(locked);
 				if !locked_before.contains_key(locked_idx) {
-					lockdep.lockdep_trace = Some(Backtrace::new());
+					let lockdep = LockDep { lock: Arc::clone(locked), lockdep_trace: Backtrace::new() };
 					locked_before.insert(*locked_idx, lockdep);
 				}
 			}