2002-07-12 Miguel de Icaza <miguel@ximian.com>

	* expression.cs (EmitLoadOpcode): System.Char is a U2, use that
	instead of the default for ValueTypes.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 21fd18a3d2686383d135305dded70a2acc216869..b94a67dbd9fade7c3de5677f9c1d09e93b75cd3b 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,6 +1,9 @@
 2002-07-12  Miguel de Icaza  <miguel@ximian.com>
 
-       * expression.cs (New.DoEmit): Use IsValueType instead of
+       * expression.cs (EmitLoadOpcode): System.Char is a U2, use that
+       instead of the default for ValueTypes.
+
+       (New.DoEmit): Use IsValueType instead of
        IsSubclassOf (value_type)
        (New.DoResolve): ditto.
        (Invocation.EmitCall): ditto.

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index cdacda9666b06e042463fbb4d3314339761cd131..366ab1a87605c0ce99819a9c89a9e03a70be556a 100755 (executable)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -5624,7 +5624,7 @@ namespace Mono.CSharp {
                                ig.Emit (OpCodes.Ldelem_I1);
                        else if (type == TypeManager.short_type)
                                ig.Emit (OpCodes.Ldelem_I2);
-                       else if (type == TypeManager.ushort_type)
+                       else if (type == TypeManager.ushort_type || type == TypeManager.char_type)
                                ig.Emit (OpCodes.Ldelem_U2);
                        else if (type == TypeManager.int32_type)
                                ig.Emit (OpCodes.Ldelem_I4);