diff options
| author | Kornél Pál <kornelpal@gmail.com> | 2010-04-08 14:55:53 +0400 |
|---|---|---|
| committer | Kornél Pál <kornelpal@gmail.com> | 2010-04-08 14:55:53 +0400 |
| commit | 506b0f407508f377947e4f68cea97bb7eede7683 (patch) | |
| tree | 4e114d7dae5dab6243a952dc0df50bb6e99143b4 | |
| parent | b458b8ab360cea5b16ff66759d469be958a319dc (diff) | |
* method-to-ir.c (mini_emit_inst_for_method): Fix a typo that caused CompareExchange not to be inlined for I8. Contributed under MIT/X11 license. Backport of r155039.
svn path=/branches/mono-2-6/mono/; revision=155040
| -rw-r--r-- | mono/mini/ChangeLog | 9 | ||||
| -rw-r--r-- | mono/mini/method-to-ir.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 33576f93b39..3ceea8b72e7 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,12 @@ +2010-04-08 Kornel Pal <kornelpal@gmail.com> + + * method-to-ir.c (mini_emit_inst_for_method): Fix a typo that caused + CompareExchange not to be inlined for I8. + + Contributed under MIT/X11 license. + + Backport of r155039. + 2010-04-06 Rodrigo Kumpera <rkumpera@novell.com> * method-to-ir.c: Fix tests/load-exceptions.cs diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c index 7f31a751bb7..1d21ee9f248 100644 --- a/mono/mini/method-to-ir.c +++ b/mono/mini/method-to-ir.c @@ -4142,7 +4142,7 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign size = 4; else if (is_ref || fsig->params [1]->type == MONO_TYPE_I) size = sizeof (gpointer); - else if (sizeof (gpointer) == 8 && fsig->params [1]->type == MONO_TYPE_I4) + else if (sizeof (gpointer) == 8 && fsig->params [1]->type == MONO_TYPE_I8) size = 8; if (size == 4) { MONO_INST_NEW (cfg, ins, OP_ATOMIC_CAS_I4); |