2004-08-11 Bernie Solomon <[email protected]>

	* mini.c: ovfops_op_map - add STACK_OBJ case for
	CONV_I
	* basic.cs: add test_0_pin_string as test
	case for above.

svn path=/trunk/mono/; revision=32251

mono/mini/ChangeLog

@@ -1,3 +1,10 @@
+2004-08-11  Bernie Solomon <[email protected]>
+
+	* mini.c: ovfops_op_map - add STACK_OBJ case for
+	CONV_I 
+	* basic.cs: add test_0_pin_string as test
+	case for above.
+
 2004-08-11  Bernie Solomon <[email protected]>
 
 	* Makefile.am: build C# if srcdir != builddir

mono/mini/basic.cs

@@ -670,6 +670,15 @@ class Tests {
 		return 0;
 	}
 
+	static unsafe int test_0_pin_string () {
+		string x = "xxx";
+		fixed (char *c = x) {
+			if (*c != 'x')
+				return 1;
+		}
+		return 0;
+	}
+
 	static int test_3_shift_regalloc () {
 		int shift = 8;
 		int orig = 1;

mono/mini/mini.c

@@ -1114,7 +1114,7 @@ unops_op_map [STACK_MAX] = {
 /* handles from CEE_CONV_U2 to CEE_SUB_OVF_UN */
 static const guint16
 ovfops_op_map [STACK_MAX] = {
-	0, 0, OP_LCONV_TO_U2-CEE_CONV_U2, OP_PCONV_TO_U2-CEE_CONV_U2, OP_FCONV_TO_U2-CEE_CONV_U2, OP_PCONV_TO_U2-CEE_CONV_U2
+	0, 0, OP_LCONV_TO_U2-CEE_CONV_U2, OP_PCONV_TO_U2-CEE_CONV_U2, OP_FCONV_TO_U2-CEE_CONV_U2, OP_PCONV_TO_U2-CEE_CONV_U2, OP_PCONV_TO_U2-CEE_CONV_U2
 };
 
 /* handles from CEE_CONV_OVF_I1_UN to CEE_CONV_OVF_U_UN */