2009-02-13 Marek Safar <marek.safar@gmail.com>

	A fix for bug #475327
	* expression.cs (ArrayCreation): Don't mutate values optimized away.

svn path=/trunk/mcs/; revision=126825

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 203ff5581c7a41581d1af350142165b6d74e6706..3f460468e974e11d69afca5a83b0711e7e785651 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-13  Marek Safar  <marek.safar@gmail.com>
+
+       A fix for bug #475327
+       * expression.cs (ArrayCreation): Don't mutate values optimized away.
+
 2009-02-13  Marek Safar  <marek.safar@gmail.com>
 
        A fix for bug #475342

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 69e30c7c58eb8526fe0ca9516e7b8f74a83ae692..4eda7867658279944e0a3861f5f1a06e703b1b0d 100644 (file)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -6211,8 +6211,13 @@ namespace Mono.CSharp {
                        }
                        
                        if (array_data != null) {
-                               foreach (Expression e in array_data)
+                               foreach (Expression e in array_data) {
+                                       // Don't mutate values optimized away
+                                       if (e == null)
+                                               continue;
+
                                        e.MutateHoistedGenericType (storey);
+                               }
                        }
                }