Merge branch 'upstream'

Former-commit-id: ee5f3d191dd8d6be84fc1337735d284891e94a99

configure.REMOVED.git-id

@@ -1 +1 @@
-938302587272c23437d39ac6e4eeec0b41200936
+892cb9f8372fb5febc0b19e0794706d083602e8d

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-d9972fe8c9ab7c2cc95cb1c92228b0f57dd1abc1
+765647b5b903bc28d1fef9b380033c7e97a449a1

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.2.0.196";
+	public const string MonoVersion = "5.2.0.209";
 	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/TimeZoneInfo.cs

@@ -152,7 +152,7 @@ namespace System
 #if !MONODROID && !MONOTOUCH && !XAMMAC
 		static TimeZoneInfo CreateLocal ()
 		{
-#if (!FULL_AOT_DESKTOP || WIN_PLATFORM) && !XAMMAC_4_5
+#if WIN_PLATFORM
 			if (IsWindows && LocalZoneKey != null) {
 				string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName");
 				if (name == null)
@@ -206,7 +206,7 @@ namespace System
 
 		static void GetSystemTimeZonesCore (List<TimeZoneInfo> systemTimeZones)
 		{
-#if (!FULL_AOT_DESKTOP || WIN_PLATFORM) && !XAMMAC_4_5
+#if WIN_PLATFORM
 			if (TimeZoneKey != null) {
 				foreach (string id in TimeZoneKey.GetSubKeyNames ()) {
 					try {

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

@@ -1 +1 @@
-4497cfcb5089d0ed6ed0b846294a63fbcf08f52e
+1ca3fde1b1b4c254fcb5eab73ff76e53342c705c

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

@@ -1 +1 @@
-b3e5819252f2dfe873b98496c4b9f7aba7845977
+ce3d07f7ec1645e24655704e780af2c167ec2228

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

@@ -1 +1 @@
-b27b8a6e548edff6c0506e9b608ba59afdb8918a
+e06237966e578465031c9b5b75fda2646c22d3b8

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

@@ -1 +1 @@
-abe11ddc5086f3f9280be51b8317faade585a3d0
+e5df4b091b873c156c670e852104e4fc3e8c0471

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

@@ -1 +1 @@
-793058153521be1aa8a87270c4b9b6946fe603fc
+5d90e89d6a858e59e8cc2236e8cc8c2123078544

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

@@ -1 +1 @@
-1ddf2e51db3032fd1035fa077362a1776bda49ec
+d2881996900ded8e0a91bd974814b5bceb32a3f8

mono/metadata/icall.c.REMOVED.git-id

@@ -1 +1 @@
-91d2682dc6ca4a024ddf6b780aadc6390c5aa4f5
+8cde6305565e88ec7e71e3242c5d16d87b28ee71

mono/metadata/w32handle.c

@@ -683,6 +683,8 @@ w32handle_destroy (gpointer handle)
 		close_func (handle, handle_specific);
 	}
 
+	memset (handle_specific, 0, mono_w32handle_ops_typesize (type));
+
 	g_free (handle_specific);
 }
 

mono/mini/generics.cs

@@ -1314,6 +1314,13 @@ class Tests
 		return RuntimeHelpers.IsReferenceOrContainsReferences<T> ();
 	}
 
+	class IsRefClass<T> {
+		[MethodImplAttribute (MethodImplOptions.NoInlining)]
+		public bool is_ref () {
+			return RuntimeHelpers.IsReferenceOrContainsReferences<T> ();
+		}
+	}
+
 	[MethodImplAttribute (MethodImplOptions.NoInlining)]
 	public static bool is_ref_or_contains_refs_gen_ref<T> () {
 		return RuntimeHelpers.IsReferenceOrContainsReferences<GenStruct<T>> ();
@@ -1343,6 +1350,12 @@ class Tests
 		int i;
 	}
 
+	struct AStruct3<T1, T2, T3> {
+		T1 t1;
+		T2 t2;
+		T3 t3;
+	}
+
 	public static int test_0_isreference_intrins () {
 		if (RuntimeHelpers.IsReferenceOrContainsReferences<int> ())
 			return 1;
@@ -1368,6 +1381,14 @@ class Tests
 		if (is_ref_or_contains_refs_gen_noref<string> ())
 			return 10;
 
+		// Complex type from shared class method
+		var c1 = new IsRefClass<AStruct3<int, int, int>> ();
+		if (c1.is_ref ())
+			return 11;
+		var c2 = new IsRefClass<AStruct3<string, int, int>> ();
+		if (!c2.is_ref ())
+			return 12;
+
 		return 0;
 	}
 }

mono/mini/gshared.cs

@@ -1972,6 +1972,30 @@ public class Tests
 		gsharedvt_vphi (0);
 		return 0;
 	}
+
+	struct AStruct3<T1, T2, T3> {
+		T1 t1;
+		T2 t2;
+		T3 t3;
+	}
+
+	interface IFaceIsRef {
+		bool is_ref<T> ();
+	}
+
+	class ClassIsRef : IFaceIsRef {
+		[MethodImplAttribute (MethodImplOptions.NoInlining)]
+		public bool is_ref<T> () {
+			return RuntimeHelpers.IsReferenceOrContainsReferences<T> ();
+		}
+	}
+
+	public static int test_0_isreference_intrins () {
+		IFaceIsRef iface = new ClassIsRef ();
+		Console.WriteLine ("X: " + iface.is_ref<AStruct3<int, int, int>> ());
+		Console.WriteLine ("X: " + iface.is_ref<AStruct3<string, int, int>> ());
+		return 0;
+	}
 }
 
 // #13191

mono/mini/method-to-ir.c.REMOVED.git-id

@@ -1 +1 @@
-770bd88ea486b45ddf4e7b0b0853bb2919302a9a
+326e6c1f9d2a80b0aee2b24acf87dcae411c4ffa

mono/mini/version.h

@@ -1 +1 @@
-#define FULL_VERSION "explicit/478c04a"
+#define FULL_VERSION "explicit/3d531ba"

mono/utils/mono-os-mutex.h

@@ -215,7 +215,7 @@ mono_os_cond_timedwait (mono_cond_t *cond, mono_mutex_t *mutex, guint32 timeout_
 
 	res = pthread_cond_timedwait (cond, mutex, &ts);
 	if (G_UNLIKELY (res != 0 && res != ETIMEDOUT))
-		g_error ("%s: pthread_cond_timedwait failed with \"%s\" (%d)", __func__, g_strerror (res), res);
+		g_error ("%s: pthread_cond_timedwait failed with \"%s\" (%d) %ld %ld %d", __func__, g_strerror (res), res, ts.tv_sec, ts.tv_nsec, timeout_ms);
 
 	return res != 0 ? -1 : 0;
 }

po/mcs/de.po.REMOVED.git-id

@@ -1 +1 @@
-e43ee10cac736cf5caff5e90c39de29168d20d6c
+1ff674825e833f9eb6565b3b1b224fc68142c7ec

po/mcs/es.po.REMOVED.git-id

@@ -1 +1 @@
-28d0680ed476c3f403c44ddf5cd77793cb914dc9
+1f1bca67f5d7b53f10b917d6506b250e9b55aebc

po/mcs/ja.po.REMOVED.git-id

@@ -1 +1 @@
-b17804e1dc2deb94f41de0bd458814284976340f
+372406d6d85830f3d29d7fc05582226359765f09

po/mcs/mcs.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mono 5.2.0.196\n"
+"Project-Id-Version: mono 5.2.0.209\n"
 "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
-"POT-Creation-Date: 2017-06-30 09:12+0000\n"
+"POT-Creation-Date: 2017-07-24 15:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

po/mcs/pt_BR.po.REMOVED.git-id

@@ -1 +1 @@
-c0fb4a021b2b9f8df75dabaa3d56f56fa6c1d017
+8ebce91f9a9a3ebc76fcd8da969a4b24726f180d