Mon Mar 1 14:43:55 CET 2010 Paolo Molaro <lupus@ximian.com>

	* method-to-ir.c: make string.InsertenalSetChar() specialization
	effective.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index e8830acc3e1e89789e545800a30e76537e4bc101..1f7dcab7e62fff0715d8ea71c9976e1fc099fa39 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,9 @@
+
+Mon Mar 1 14:43:55 CET 2010 Paolo Molaro <lupus@ximian.com>
+
+       * method-to-ir.c: make string.InsertenalSetChar() specialization
+       effective.
+
 2010-03-01  Robert Jordan  <robertj@gmx.net>
 
        * Makefile.am: fix the non-static build. 

diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
index a5d873df1083b20e53b042c1fe3a08c451540150..713dcec075eba5cf4566a458ed25c0b3c25181e3 100644 (file)
--- a/mono/mini/method-to-ir.c
+++ b/mono/mini/method-to-ir.c
@@ -3980,6 +3980,7 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
                        MONO_EMIT_NEW_BIALU_IMM (cfg, OP_SHL_IMM, mult_reg, args [1]->dreg, 1);
                        MONO_EMIT_NEW_BIALU (cfg, OP_PADD, add_reg, mult_reg, args [0]->dreg);
                        MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STOREI2_MEMBASE_REG, add_reg, G_STRUCT_OFFSET (MonoString, chars), args [2]->dreg);
+                       return cfg->cbb->last_ins;
                } else 
                        return NULL;
        } else if (cmethod->klass == mono_defaults.object_class) {