Merge pull request #14402 from jkotas/coreclr-issue-8577

Regression test for dotnet/coreclr#8580

src/System.Runtime/tests/System/Runtime/CompilerServices/ConditionalWeakTableTests.cs

@@ -183,6 +183,28 @@ public static void Concurrent_GetValue_Read_Remove_SameObject()
             });
         }
 
+        [Fact]
+        public static void AddRemove_DropValue()
+        {
+            var key = new object();
+            var value = new object();
+
+            var cwt = new ConditionalWeakTable<object, object>();
+
+            cwt.Add(key, value);
+            cwt.Remove(key);
+
+            // Verify that the removed entry is not keeping the value alive
+            var wrValue = new WeakReference(value);
+            value = null;
+
+            GC.Collect();
+            Assert.False(wrValue.IsAlive);
+
+            GC.KeepAlive(cwt);
+            GC.KeepAlive(key);
+        }
+
         [Fact]
         public static void GetOrCreateValue()
         {