Respect [MemberNotNull] on local function

dotnet · Oct 10, 2024 · f49a448 · f49a448
1 parent a656d1a
commit f49a448
Show file tree

Hide file tree

Showing 2 changed files with 360 additions and 25 deletions.
diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/NullableWalker.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/NullableWalker.cs
@@ -2012,7 +2012,7 @@ int makeSlot(BoundExpression node)
                     case BoundKind.ThisReference:
                     case BoundKind.BaseReference:
                         {
-                            var method = getTopLevelMethod(_symbol as MethodSymbol);
+                            var method = GetTopLevelMethod(_symbol as MethodSymbol);
                             var thisParameter = method?.ThisParameter;
                             return thisParameter is object ? GetOrCreateSlot(thisParameter) : -1;
                         }
@@ -2090,20 +2090,20 @@ int getPlaceholderSlot(BoundExpression expr)
                 }
                 return -1;
             }
+        }
 
-            static MethodSymbol? getTopLevelMethod(MethodSymbol? method)
+        static MethodSymbol? GetTopLevelMethod(MethodSymbol? method)
+        {
+            while (method is object)
             {
-                while (method is object)
+                var container = method.ContainingSymbol;
+                if (container.Kind == SymbolKind.NamedType)
                 {
-                    var container = method.ContainingSymbol;
-                    if (container.Kind == SymbolKind.NamedType)
-                    {
-                        return method;
-                    }
-                    method = container as MethodSymbol;
+                    return method;
                 }
-                return null;
+                method = container as MethodSymbol;
             }
+            return null;
         }
 
         protected override int GetOrCreateSlot(Symbol symbol, int containingSlot = 0, bool forceSlotEvenIfEmpty = false, bool createIfMissing = true)
@@ -7012,6 +7012,12 @@ private void ApplyMemberPostConditions(BoundExpression? receiverOpt, MethodSymbo
                 receiverOpt is null ? -1 :
                 MakeSlot(receiverOpt);
 
+            if (method.MethodKind == MethodKind.LocalFunction
+                && GetTopLevelMethod(method) is { ThisParameter: { } thisParameter })
+            {
+                receiverSlot = GetOrCreateSlot(thisParameter);
+            }
+
             if (receiverSlot < 0)
             {
                 return;