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

	* expression.cs (ArrayAccess.EmitAssign): Mimic the same test from
	EmitDynamicInitializers for the criteria to use Ldelema.  Thanks
	to hwang_rob@yahoo.ca for finding the bug and providing a patch.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 3385ae45b57985a0486a2ca41008782c2451fb90..d3b4ed0b83938d679cebcc95f5b208d2f2b77e1f 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,5 +1,9 @@
 2002-09-25  Miguel de Icaza  <miguel@ximian.com>
 
+       * expression.cs (ArrayAccess.EmitAssign): Mimic the same test from
+       EmitDynamicInitializers for the criteria to use Ldelema.  Thanks
+       to hwang_rob@yahoo.ca for finding the bug and providing a patch.
+
        * ecore.cs (TryImplicitIntConversion): When doing an
        implicit-enumeration-conversion, check if the type is 64-bits and
        perform a conversion before passing to EnumConstant.

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index c7bd0bcbd5f38ad27831ca287868590273df973b..3d92824397d58a672b217d1faba2da7aa0dd9c35 100755 (executable)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -6217,7 +6217,7 @@ namespace Mono.CSharp {
                        // pair
                        //
                        if (rank == 1){
-                               if (t.IsValueType && !TypeManager.IsBuiltinType (t))
+                               if (t.IsSubclassOf (TypeManager.value_type) && (!TypeManager.IsBuiltinType (t) || t == TypeManager.decimal_type))
                                        ig.Emit (OpCodes.Ldelema, t);
                        }