Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850

mcs/tests/test-940.cs

@@ -0,0 +1,31 @@
+// Compiler options: -unsafe
+
+using System;
+
+struct nint
+{
+	public static nint operator * (nint a, nint b)
+	{
+		return a;
+	}
+
+	public static implicit operator long (nint v)
+	{
+		return 0;
+	}
+}
+
+class X
+{
+	public static void Main ()
+	{
+		nint width;
+		nint bytesPerRow;
+
+		unsafe {
+			var da = (uint*)0;
+			var dp1 = da + width * bytesPerRow;
+			var dp2 = width * bytesPerRow + da;
+		}
+	}
+}