diff options
| author | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-12-03 18:47:01 +0300 |
|---|---|---|
| committer | Aleksey Kliger (λgeek) <alklig@microsoft.com> | 2019-12-03 18:47:01 +0300 |
| commit | bef1e6335812d32f8eab648c0228fc624b9f8357 (patch) | |
| tree | 764844c0d8a79887beed7ba96ca24a4157727487 | |
| parent | 56325f4097f3460b05395c68ccf3f47996ceea52 (diff) | |
[interp] track valuetype stack for CEE_RET too (#17998)mono-6.6.0.161
Backport of #17968
Fixes https://github.com/mono/mono/issues/17924
| -rw-r--r-- | mono/mini/iltests.il | 50 | ||||
| -rw-r--r-- | mono/mini/interp/transform.c | 2 |
2 files changed, 52 insertions, 0 deletions
diff --git a/mono/mini/iltests.il b/mono/mini/iltests.il index 063a271684a..f931a0b4ded 100644 --- a/mono/mini/iltests.il +++ b/mono/mini/iltests.il @@ -3182,6 +3182,56 @@ L_3: ret } + .method private hidebysig static valuetype [mscorlib]System.Nullable`1<int32> ret_some_vt(int32 val) cil managed + { + .maxstack 8 + ldarg.0 + newobj instance void valuetype [mscorlib]System.Nullable`1<int32>::.ctor(!0) + ldarg.0 + ldc.i4.0 + ble.s second_vt + + ldarg.0 + ldc.i4.s 40 + add + newobj instance void valuetype [mscorlib]System.Nullable`1<int32>::.ctor(!0) + pop + ret + +second_vt_2: + ldarg.0 + ldc.i4.s 30 + add + newobj instance void valuetype [mscorlib]System.Nullable`1<int32>::.ctor(!0) + ret + +second_vt: + pop + br second_vt_2 + } + + // https://github.com/mono/mono/issues/17924 + .method static public int32 test_0_vt_sp_tracking () cil managed + { + .maxstack 2 + .locals init (valuetype [mscorlib]System.Nullable`1<int32> V_0) + + ldc.i4.s 10 + call valuetype [mscorlib]System.Nullable`1<int32> Tests::ret_some_vt(int32) + stloc.0 + ldloca.s V_0 + call instance !0 valuetype [mscorlib]System.Nullable`1<int32>::get_Value() + ldc.i4.s 10 + bne.un.s wrong + + ldc.i4.0 + ret + +wrong: + ldc.i4.1 + ret + } + .method public hidebysig static int32 test_10_rconv_to_u8_ovf_un() cil managed { // Code size 20 (0x14) diff --git a/mono/mini/interp/transform.c b/mono/mini/interp/transform.c index 00927473a9c..54c49a0168b 100644 --- a/mono/mini/interp/transform.c +++ b/mono/mini/interp/transform.c @@ -3429,6 +3429,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header, if (ult->type == MONO_TYPE_VOID) vt_size = -1; WRITE32_INS (td->last_ins, 0, &vt_size); + POP_VT (td, vt_size); ++td->ip; } else { if (vt_size == 0) @@ -3436,6 +3437,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header, else { interp_add_ins (td, MINT_RET_VT); WRITE32_INS (td->last_ins, 0, &vt_size); + POP_VT (td, vt_size); ++td->ip; } } |