2002-09-03 Miguel de Icaza <miguel@ximian.com>

	* statement.cs (SwitchLabel.ResolveAndReduce): In the string case,
	it was important that we stored the right value after the
	reduction in `converted'.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 328a45a706da8eca4da66b6d75dd8c510787c0f4..be49964702c59a14b71ecb7147dd3479874ac226 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-03  Miguel de Icaza  <miguel@ximian.com>
+
+       * statement.cs (SwitchLabel.ResolveAndReduce): In the string case,
+       it was important that we stored the right value after the
+       reduction in `converted'.
+
 2002-09-04  Martin Baulig  <martin@gnome.org>
 
        * location.cs (Location.SymbolDocument): Use full pathnames for the

diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
index 3b4d3e805ef5de5c3f9abad22728cd2e1665af12..c8a171ba9dfb99f76667cc37c5e3e422f873479c 100755 (executable)
--- a/mcs/mcs/statement.cs
+++ b/mcs/mcs/statement.cs
@@ -3031,7 +3031,7 @@ namespace Mono.CSharp {
 
                        if (e is StringConstant || e is NullLiteral){
                                if (required_type == TypeManager.string_type){
-                                       converted = label;
+                                       converted = e;
                                        ILLabel = ec.ig.DefineLabel ();
                                        return true;
                                }