From 52dbd789a81cf3a23502df6e2b253968e2b950bb Mon Sep 17 00:00:00 2001 From: Mark Probst Date: Wed, 13 Jan 2010 15:52:57 +0000 Subject: [PATCH] 2010-01-13 Mark Probst * method-to-ir.c (mini_emit_stobj): Use EMIT_NEW_CLASSCONST when AOT compiling. svn path=/trunk/mono/; revision=149478 --- mono/mini/ChangeLog | 4 ++++ mono/mini/method-to-ir.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index cab9976135d..85d615d4f84 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,7 @@ +2010-01-13 Mark Probst + + * method-to-ir.c (mini_emit_stobj): Use EMIT_NEW_CLASSCONST when + AOT compiling. Wed Jan 13 15:54:53 CET 2010 Paolo Molaro diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c index 1f6242e4ee5..edb9887d879 100644 --- a/mono/mini/method-to-ir.c +++ b/mono/mini/method-to-ir.c @@ -2570,8 +2570,12 @@ mini_emit_stobj (MonoCompile *cfg, MonoInst *dest, MonoInst *src, MonoClass *kla if (context_used) { iargs [2] = emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS); } else { - EMIT_NEW_PCONST (cfg, iargs [2], klass); - mono_class_compute_gc_descriptor (klass); + if (cfg->compile_aot) { + EMIT_NEW_CLASSCONST (cfg, iargs [2], klass); + } else { + EMIT_NEW_PCONST (cfg, iargs [2], klass); + mono_class_compute_gc_descriptor (klass); + } } mono_emit_jit_icall (cfg, mono_value_copy, iargs); -- 2.11.4.GIT