Imported Upstream version 3.6.0

Former-commit-id: da6be194a6b1221998fc28233f2503bd61dd9d14

mcs/tests/test-79.cs

@@ -0,0 +1,17 @@
+//
+// This test excercises the compiler being able to compute
+// correctly the return type in the presence of null (as null
+// will be implicitly convertible to anything
+//
+class X {
+
+	public static int Main ()
+	{
+		object o = null;
+
+		string s = o == null ? "string" : null;
+		string d = o == null ? null : "string";
+
+		return 0;
+	}
+}