[642975] Fix initializer of partially static multidimensional arrays

mcs/mcs/expression.cs

@@ -5949,7 +5949,6 @@ namespace Mono.CSharp {
 			if (initializers == null)
 				return true;
 
-			only_constant_initializers = true;
 			for (int i = 0; i < probe.Count; ++i) {
 				var o = probe [i];
 				if (o is ArrayInitializer) {
@@ -6057,6 +6056,8 @@ namespace Mono.CSharp {
 
 		protected bool ResolveInitializers (ResolveContext ec)
 		{
+			only_constant_initializers = true;
+
 			if (arguments != null) {
 				bool res = true;
 				for (int i = 0; i < arguments.Count; ++i) {

mcs/tests/test-539.cs

+// Compiler options: -optimize
+using System;
+
+class Test
+{
+	static int Main ()
+	{
+		//switching to a constant fixes the problem
+		double thisIsCausingTheProblem = 5.0;
+
+		double[,] m1 = new double[4, 4] {
+			{ 1.0, 0.0, 0.0, thisIsCausingTheProblem },
+			{ 0.0, 1.0, 0.0, thisIsCausingTheProblem },
+			{ 0.0, 0.0, 1.0, thisIsCausingTheProblem },
+			{ 0.0, 0.0, 0.0, 1.0 }
+		};
+
+		var r = m1[0, 3];
+		if (r != 5)
+			return 1;
+
+		return 0;
+	}
+}