Make sure the compile-time locking promises given via LockAnnotation:s hold also in practice at runtime (ifdef DEBUG_LOCKORDER)

practicalswift · practicalswift · commit de9b5dbca342 · 2019-05-17T13:29:04.000+02:00
diff --git a/src/sync.h b/src/sync.h
@@ -311,6 +311,9 @@ struct SCOPED_LOCKABLE LockAnnotation
     template <typename Mutex>
     explicit LockAnnotation(Mutex& mutex) EXCLUSIVE_LOCK_FUNCTION(mutex)
     {
+#ifdef DEBUG_LOCKORDER
+        AssertLockHeld(mutex);
+#endif
     }
     ~LockAnnotation() UNLOCK_FUNCTION() {}
 };

Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,9 @@ struct SCOPED_LOCKABLE LockAnnotation`
`311`	`311`	`template <typename Mutex>`
`312`	`312`	`explicit LockAnnotation(Mutex& mutex) EXCLUSIVE_LOCK_FUNCTION(mutex)`
`313`	`313`	`{`
	`314`	`+#ifdef DEBUG_LOCKORDER`
	`315`	`+ AssertLockHeld(mutex);`
	`316`	`+#endif`
`314`	`317`	`}`
`315`	`318`	`~LockAnnotation() UNLOCK_FUNCTION() {}`
`316`	`319`	`};`