Merge branch 'upstream'

Former-commit-id: 7c4372ffeca2839f3129d7a23891c9a52a296669

configure.REMOVED.git-id

@@ -1 +1 @@
-a8a3dec4f955c24b4400ea1a0230a855d96b97cf
+328b4f0c7026773896f9b8f9431e22729d34c418

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-dae60eb72446d9ce5f213d3cb3678c206afba466
+1acb4ecc41015019c7f394aaf1b1025246bc3a01

mcs/build/common/Consts.cs

@@ -34,7 +34,7 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//
 
-	public const string MonoVersion = "5.16.0.160";
+	public const string MonoVersion = "5.16.0.163";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";

mcs/class/corlib/System.Runtime.CompilerServices/ConditionalWeakTable.cs

@@ -31,6 +31,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
 
 namespace System.Runtime.CompilerServices
 {
@@ -375,11 +377,109 @@ namespace System.Runtime.CompilerServices
 			}
 		}
 
+		// IEnumerable implementation was copied from CoreCLR
 		IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator ()
 		{
-			throw new NotImplementedException ();
+			lock (_lock)
+			{
+				return size == 0 ?
+					((IEnumerable<KeyValuePair<TKey, TValue>>)Array.Empty<KeyValuePair<TKey, TValue>>()).GetEnumerator() :
+					new Enumerator(this);
+			}
 		}
 
 		IEnumerator IEnumerable.GetEnumerator () => ((IEnumerable<KeyValuePair<TKey, TValue>>)this).GetEnumerator ();
+		
+		/// <summary>Provides an enumerator for the table.</summary>
+		private sealed class Enumerator : IEnumerator<KeyValuePair<TKey, TValue>>
+		{
+			// The enumerator would ideally hold a reference to the Container and the end index within that
+			// container.  However, the safety of the CWT depends on the only reference to the Container being
+			// from the CWT itself; the Container then employs a two-phase finalization scheme, where the first
+			// phase nulls out that parent CWT's reference, guaranteeing that the second time it's finalized there
+			// can be no other existing references to it in use that would allow for concurrent usage of the
+			// native handles with finalization.  We would break that if we allowed this Enumerator to hold a
+			// reference to the Container.  Instead, the Enumerator holds a reference to the CWT rather than to
+			// the Container, and it maintains the CWT._activeEnumeratorRefCount field to track whether there
+			// are outstanding enumerators that have yet to be disposed/finalized.  If there aren't any, the CWT
+			// behaves as it normally does.  If there are, certain operations are affected, in particular resizes.
+			// Normally when the CWT is resized, it enumerates the contents of the table looking for indices that
+			// contain entries which have been collected or removed, and it frees those up, effectively moving
+			// down all subsequent entries in the container (not in the existing container, but in a replacement).
+			// This, however, would cause the enumerator's understanding of indices to break.  So, as long as
+			// there is any outstanding enumerator, no compaction is performed.
+
+			private ConditionalWeakTable<TKey, TValue> _table; // parent table, set to null when disposed
+			private int _currentIndex = -1;                    // the current index into the container
+			private KeyValuePair<TKey, TValue> _current;       // the current entry set by MoveNext and returned from Current
+
+			public Enumerator(ConditionalWeakTable<TKey, TValue> table)
+			{
+				// Store a reference to the parent table and increase its active enumerator count.
+				_table = table;
+				_currentIndex = -1;
+			}
+
+			~Enumerator() { Dispose(); }
+
+			public void Dispose()
+			{
+				// Use an interlocked operation to ensure that only one thread can get access to
+				// the _table for disposal and thus only decrement the ref count once.
+				ConditionalWeakTable<TKey, TValue> table = Interlocked.Exchange(ref _table, null);
+				if (table != null)
+				{
+					// Ensure we don't keep the last current alive unnecessarily
+					_current = default;
+
+					// Finalization is purely to decrement the ref count.  We can suppress it now.
+					GC.SuppressFinalize(this);
+				}
+			}
+
+			public bool MoveNext()
+			{
+				// Start by getting the current table.  If it's already been disposed, it will be null.
+				ConditionalWeakTable<TKey, TValue> table = _table;
+				if (table != null)
+				{
+					// Once have the table, we need to lock to synchronize with other operations on
+					// the table, like adding.
+					lock (table._lock)
+					{
+						var tombstone = GC.EPHEMERON_TOMBSTONE;
+						while (_currentIndex < table.data.Length - 1)
+						{
+							_currentIndex++;
+							var currentDataItem = table.data[_currentIndex];
+							if (currentDataItem.key != null && currentDataItem.key != tombstone)
+							{
+								_current = new KeyValuePair<TKey, TValue>((TKey)currentDataItem.key, (TValue)currentDataItem.value);
+								return true;
+							}
+						}
+					}
+				}
+
+				// Nothing more to enumerate.
+				return false;
+			}
+
+			public KeyValuePair<TKey, TValue> Current
+			{
+				get
+				{
+					if (_currentIndex < 0)
+					{
+						ThrowHelper.ThrowInvalidOperationException_InvalidOperation_EnumOpCantHappen();
+					}
+					return _current;
+				}
+			}
+
+			object IEnumerator.Current => Current;
+
+			public void Reset() { }
+		}
 	}
 }

mcs/class/corlib/Test/System.Runtime.CompilerServices/ConditionalWeakTableTest.cs

@@ -29,6 +29,7 @@
 
 using NUnit.Framework;
 using System;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -486,6 +487,20 @@ namespace MonoTests.System.Runtime.CompilerServices {
 				Assert.IsTrue (table.Remove (key), "#2-" + i + "-k-" + key);
 		}
 	}
+
+	[Test]
+	public void ConditionalWeakTableEnumerable()
+	{
+		var cwt = new ConditionalWeakTable<string, string>();
+		Assert.AreEqual(0, cwt.ToArray().Length);
+		cwt.Add("test1", "foo1");
+		cwt.Add("test2", "foo2");
+		Assert.AreEqual(2, cwt.ToArray().Length);
+		cwt.Remove("test1");
+		Assert.AreEqual(1, cwt.ToArray().Length);
+		cwt.Remove("test2");
+		Assert.AreEqual(0, cwt.ToArray().Length);
+	}
 	}
 }
 

mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-9340050d3e1d0b1811befe3ea863039a29991c05
+cbcd64cd77d070cd661473e23a4316790b765443

mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-b5679a6f8a5199ca74d7143777f0742a5e0a00fd
+f481c6fb894fd7af68e77220f2c7493b67a4fcd6

mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-4131faad1c2afbbc0aab29999890df98c9a3b9bc
+9017348bf1891a3baea0087b4db14b694f7a3001

mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-c2cb4d0ef943e31143821b8ef5f784d0cfd595f4
+dfd320e42236ccea92c0012a84d4a13d26467077

mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-7c241e20526e563aa837c5a6a5e06ff3d71ce0a8
+0db065b891cf7add08bdba86fcc71a56615c35ba

mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id

@@ -1 +1 @@
-89ffdbff17871bc72d84d1750e31ab3f03dab725
+d2ce1f246fb723c118ea12eee232a6b39800ecda

mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id

@@ -1 +1 @@
-d8a0ffa13d365a4212d158f99ec3689f9d2d61e9
+a0159ead83b6724f17857a322578e51f3817329d

mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-9340050d3e1d0b1811befe3ea863039a29991c05
+cbcd64cd77d070cd661473e23a4316790b765443

mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-b5679a6f8a5199ca74d7143777f0742a5e0a00fd
+f481c6fb894fd7af68e77220f2c7493b67a4fcd6

mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-4131faad1c2afbbc0aab29999890df98c9a3b9bc
+9017348bf1891a3baea0087b4db14b694f7a3001

mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-c2cb4d0ef943e31143821b8ef5f784d0cfd595f4
+dfd320e42236ccea92c0012a84d4a13d26467077

mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-7c241e20526e563aa837c5a6a5e06ff3d71ce0a8
+0db065b891cf7add08bdba86fcc71a56615c35ba

mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id

@@ -1 +1 @@
-89ffdbff17871bc72d84d1750e31ab3f03dab725
+d2ce1f246fb723c118ea12eee232a6b39800ecda