[lldb] ifdef IsScratchContextLocked for asserts (#6875)

kastiglione · web-flow · commit d8d45aa3245e · 2023-05-17T08:39:55.000-07:00
`IsScratchContextLocked` is racey, but is called only from asserts. Put these functions
behind `#ifndef NDEBUG` to make them less likely to be used accidentally.
diff --git a/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp b/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp
@@ -1909,7 +1909,8 @@ bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_Pack(
   return true;
 }
 
-/// Determine whether the scratch SwiftASTContext has been locked.
+#ifndef NDEBUG
+/// Assert helper to determine if the scratch SwiftASTContext is locked.
 static bool IsScratchContextLocked(Target &target) {
   if (target.GetSwiftScratchContextLock().try_lock()) {
     target.GetSwiftScratchContextLock().unlock();
@@ -1918,10 +1919,11 @@ static bool IsScratchContextLocked(Target &target) {
   return true;
 }
 
-/// Determine whether the scratch SwiftASTContext has been locked.
+/// Assert helper to determine if the scratch SwiftASTContext is locked.
 static bool IsScratchContextLocked(TargetSP target) {
   return target ? IsScratchContextLocked(*target) : true;
 }
+#endif
 
 static bool IsPrivateNSClass(NodePointer node) {
   if (!node || node->getKind() != Node::Kind::Type ||

Original file line number	Diff line number	Diff line change
`@@ -1909,7 +1909,8 @@ bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_Pack(`
`1909`	`1909`	`return true;`
`1910`	`1910`	`}`
`1911`	`1911`
`1912`		`-/// Determine whether the scratch SwiftASTContext has been locked.`
	`1912`	`+#ifndef NDEBUG`
	`1913`	`+/// Assert helper to determine if the scratch SwiftASTContext is locked.`
`1913`	`1914`	`static bool IsScratchContextLocked(Target &target) {`
`1914`	`1915`	`if (target.GetSwiftScratchContextLock().try_lock()) {`
`1915`	`1916`	`target.GetSwiftScratchContextLock().unlock();`
`@@ -1918,10 +1919,11 @@ static bool IsScratchContextLocked(Target &target) {`
`1918`	`1919`	`return true;`
`1919`	`1920`	`}`
`1920`	`1921`
`1921`		`-/// Determine whether the scratch SwiftASTContext has been locked.`
	`1922`	`+/// Assert helper to determine if the scratch SwiftASTContext is locked.`
`1922`	`1923`	`static bool IsScratchContextLocked(TargetSP target) {`
`1923`	`1924`	`return target ? IsScratchContextLocked(*target) : true;`
`1924`	`1925`	`}`
	`1926`	`+#endif`
`1925`	`1927`
`1926`	`1928`	`static bool IsPrivateNSClass(NodePointer node) {`
`1927`	`1929`	`if (!node \|\| node->getKind() != Node::Kind::Type \|\|`