Filter warning for yield return in the new lock

jjonescz · Mar 27, 2024 · eafc594 · eafc594
1 parent 654d458
commit eafc594
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/Compilers/CSharp/Portable/Binder/LockBinder.cs b/src/Compilers/CSharp/Portable/Binder/LockBinder.cs
@@ -55,8 +55,9 @@ internal override BoundStatement BindLockStatementParts(BindingDiagnosticBag dia
                 hasErrors = true;
             }
 
-            if (exprType?.IsWellKnownTypeLock() == true &&
-                TryFindLockTypeInfo(exprType, diagnostics, exprSyntax) is { } lockTypeInfo)
+            bool isLockObjectBased = exprType?.IsWellKnownTypeLock() == true;
+            if (isLockObjectBased &&
+                TryFindLockTypeInfo(exprType!, diagnostics, exprSyntax) is { } lockTypeInfo)
             {
                 CheckFeatureAvailability(exprSyntax, MessageID.IDS_FeatureLockObject, diagnostics);
 
@@ -73,8 +74,18 @@ internal override BoundStatement BindLockStatementParts(BindingDiagnosticBag dia
                     errorCode: ErrorCode.ERR_BadSpecialByRefLock);
             }
 
-            BoundStatement stmt = originalBinder.BindPossibleEmbeddedStatement(_syntax.Statement, diagnostics);
+            var needsFilterDiagnostics = isLockObjectBased && diagnostics.AccumulatesDiagnostics;
+            var bodyDiagnostics = needsFilterDiagnostics ? BindingDiagnosticBag.GetInstance(template: diagnostics) : diagnostics;
+
+            BoundStatement stmt = originalBinder.BindPossibleEmbeddedStatement(_syntax.Statement, bodyDiagnostics);
             Debug.Assert(this.Locals.IsDefaultOrEmpty);
+
+            if (needsFilterDiagnostics)
+            {
+                bodyDiagnostics.CopyFilteredToAndFree(diagnostics,
+                    static code => code is not ErrorCode.WRN_BadYieldInLock);
+            }
+
             return new BoundLockStatement(_syntax, expr, stmt, hasErrors);
         }