Skip to content

Commit c6619a7

Browse files
lateralusXlateralusX
committed
Fix merge conflicts and new issues.
1 parent 833ef40 commit c6619a7

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎src/mono/mono/metadata/marshal-lightweight.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ mono_mb_emit_save_args (MonoMethodBuilder *mb, MonoMethodSignature *sig, gboolea
196196
mono_mb_emit_byte (mb, CEE_STIND_I);
197197
/* tmp = tmp + sizeof (gpointer) */
198198
if (sig->param_count)
199-
mono_mb_emit_add_to_local (mb, tmp_var, TARGET_SIZEOF_VOID_P);
199+
mono_mb_emit_add_to_local (mb, GINT_TO_UINT16 (tmp_var), TARGET_SIZEOF_VOID_P);
200200

201201
}
202202

@@ -206,7 +206,7 @@ mono_mb_emit_save_args (MonoMethodBuilder *mb, MonoMethodSignature *sig, gboolea
206206
mono_mb_emit_byte (mb, CEE_STIND_I);
207207
/* tmp = tmp + sizeof (gpointer) */
208208
if (i < (sig->param_count - 1))
209-
mono_mb_emit_add_to_local (mb, tmp_var, TARGET_SIZEOF_VOID_P);
209+
mono_mb_emit_add_to_local (mb, GINT_TO_UINT16 (tmp_var), TARGET_SIZEOF_VOID_P);
210210
}
211211

212212
return params_var;
@@ -413,7 +413,7 @@ emit_invoke_call (MonoMethodBuilder *mb, MonoMethod *method,
413413
mono_mb_emit_exception_full (mb, "Mono", "NullByRefReturnException", NULL);
414414
mono_mb_patch_branch (mb, pos);
415415

416-
int ldind_op;
416+
guint8 ldind_op;
417417
MonoType* ret_byval = m_class_get_byval_arg (mono_class_from_mono_type_internal (sig->ret));
418418
g_assert (!m_type_is_byref (ret_byval));
419419
// TODO: Handle null references
@@ -1228,7 +1228,7 @@ load_array_class (MonoMethodBuilder *mb, int aklass)
12281228
mono_mb_emit_byte (mb, CEE_LDIND_I);
12291229
mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoVTable, klass));
12301230
mono_mb_emit_byte (mb, CEE_LDIND_I);
1231-
mono_mb_emit_ldflda (mb, m_class_offsetof_element_class ());
1231+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_element_class ()));
12321232
mono_mb_emit_byte (mb, CEE_LDIND_I);
12331233
mono_mb_emit_stloc (mb, aklass);
12341234
}
@@ -1467,22 +1467,22 @@ emit_virtual_stelemref_ilgen (MonoMethodBuilder *mb, const char **param_names, M
14671467

14681468
/* if (vklass->idepth < aklass->idepth) goto failue */
14691469
mono_mb_emit_ldloc (mb, vklass);
1470-
mono_mb_emit_ldflda (mb, m_class_offsetof_idepth ());
1470+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_idepth ()));
14711471
mono_mb_emit_byte (mb, CEE_LDIND_U2);
14721472

14731473
mono_mb_emit_ldloc (mb, aklass);
1474-
mono_mb_emit_ldflda (mb, m_class_offsetof_idepth ());
1474+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_idepth ()));
14751475
mono_mb_emit_byte (mb, CEE_LDIND_U2);
14761476

14771477
b3 = mono_mb_emit_branch (mb, CEE_BLT_UN);
14781478

14791479
/* if (vklass->supertypes [aklass->idepth - 1] != aklass) goto failure */
14801480
mono_mb_emit_ldloc (mb, vklass);
1481-
mono_mb_emit_ldflda (mb, m_class_offsetof_supertypes ());
1481+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_supertypes ()));
14821482
mono_mb_emit_byte (mb, CEE_LDIND_I);
14831483

14841484
mono_mb_emit_ldloc (mb, aklass);
1485-
mono_mb_emit_ldflda (mb, m_class_offsetof_idepth ());
1485+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_idepth ()));
14861486
mono_mb_emit_byte (mb, CEE_LDIND_U2);
14871487
mono_mb_emit_icon (mb, 1);
14881488
mono_mb_emit_byte (mb, CEE_SUB);
@@ -1549,11 +1549,11 @@ emit_virtual_stelemref_ilgen (MonoMethodBuilder *mb, const char **param_names, M
15491549

15501550
/* if (vklass->supertypes [aklass->idepth - 1] != aklass) goto failure */
15511551
mono_mb_emit_ldloc (mb, vklass);
1552-
mono_mb_emit_ldflda (mb, m_class_offsetof_supertypes ());
1552+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_supertypes ()));
15531553
mono_mb_emit_byte (mb, CEE_LDIND_I);
15541554

15551555
mono_mb_emit_ldloc (mb, aklass);
1556-
mono_mb_emit_ldflda (mb, m_class_offsetof_idepth ());
1556+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_idepth ()));
15571557
mono_mb_emit_byte (mb, CEE_LDIND_U2);
15581558
mono_mb_emit_icon (mb, 1);
15591559
mono_mb_emit_byte (mb, CEE_SUB);
@@ -1622,7 +1622,7 @@ emit_virtual_stelemref_ilgen (MonoMethodBuilder *mb, const char **param_names, M
16221622

16231623
/* uiid = klass->interface_id; */
16241624
mono_mb_emit_ldloc (mb, aklass);
1625-
mono_mb_emit_ldflda (mb, m_class_offsetof_interface_id ());
1625+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_interface_id ()));
16261626
mono_mb_emit_byte (mb, CEE_LDIND_U4);
16271627
mono_mb_emit_stloc (mb, uiid);
16281628

@@ -1740,7 +1740,7 @@ emit_stelemref_ilgen (MonoMethodBuilder *mb)
17401740
mono_mb_emit_byte (mb, CEE_LDIND_I);
17411741
mono_mb_emit_ldflda (mb, MONO_STRUCT_OFFSET (MonoVTable, klass));
17421742
mono_mb_emit_byte (mb, CEE_LDIND_I);
1743-
mono_mb_emit_ldflda (mb, m_class_offsetof_element_class ());
1743+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_element_class ()));
17441744
mono_mb_emit_byte (mb, CEE_LDIND_I);
17451745
mono_mb_emit_stloc (mb, aklass);
17461746

@@ -1754,22 +1754,22 @@ emit_stelemref_ilgen (MonoMethodBuilder *mb)
17541754

17551755
/* if (vklass->idepth < aklass->idepth) goto failue */
17561756
mono_mb_emit_ldloc (mb, vklass);
1757-
mono_mb_emit_ldflda (mb, m_class_offsetof_idepth ());
1757+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_idepth ()));
17581758
mono_mb_emit_byte (mb, CEE_LDIND_U2);
17591759

17601760
mono_mb_emit_ldloc (mb, aklass);
1761-
mono_mb_emit_ldflda (mb, m_class_offsetof_idepth ());
1761+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_idepth ()));
17621762
mono_mb_emit_byte (mb, CEE_LDIND_U2);
17631763

17641764
b2 = mono_mb_emit_branch (mb, CEE_BLT_UN);
17651765

17661766
/* if (vklass->supertypes [aklass->idepth - 1] != aklass) goto failure */
17671767
mono_mb_emit_ldloc (mb, vklass);
1768-
mono_mb_emit_ldflda (mb, m_class_offsetof_supertypes ());
1768+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_supertypes ()));
17691769
mono_mb_emit_byte (mb, CEE_LDIND_I);
17701770

17711771
mono_mb_emit_ldloc (mb, aklass);
1772-
mono_mb_emit_ldflda (mb, m_class_offsetof_idepth ());
1772+
mono_mb_emit_ldflda (mb, GINTPTR_TO_INT32 (m_class_offsetof_idepth ()));
17731773
mono_mb_emit_byte (mb, CEE_LDIND_U2);
17741774
mono_mb_emit_icon (mb, 1);
17751775
mono_mb_emit_byte (mb, CEE_SUB);
@@ -1901,7 +1901,7 @@ emit_array_address_ilgen (MonoMethodBuilder *mb, int rank, int elem_size)
19011901
mono_mb_emit_byte (mb, CEE_ADD);
19021902
mono_mb_emit_byte (mb, CEE_LDIND_I);
19031903
/* sizes is an union, so this reads sizes.element_size */
1904-
mono_mb_emit_icon (mb, m_class_offsetof_sizes ());
1904+
mono_mb_emit_icon (mb, GINTPTR_TO_INT32 (m_class_offsetof_sizes ()));
19051905
mono_mb_emit_byte (mb, CEE_ADD);
19061906
mono_mb_emit_byte (mb, CEE_LDIND_I4);
19071907
}
@@ -2115,7 +2115,7 @@ emit_delegate_invoke_internal_ilgen (MonoMethodBuilder *mb, MonoMethodSignature
21152115
mono_mb_emit_stloc (mb, local_res);
21162116

21172117
/* i += 1 */
2118-
mono_mb_emit_add_to_local (mb, local_i, 1);
2118+
mono_mb_emit_add_to_local (mb, GINT_TO_UINT16 (local_i), 1);
21192119

21202120
/* i < l */
21212121
mono_mb_emit_ldloc (mb, local_i);
@@ -3067,7 +3067,7 @@ emit_icall_wrapper_ilgen (MonoMethodBuilder *mb, MonoJitICallInfo *callinfo, Mon
30673067

30683068
mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
30693069
mono_mb_emit_byte (mb, CEE_MONO_JIT_ICALL_ADDR);
3070-
mono_mb_emit_i4 (mb, mono_jit_icall_info_index (callinfo));
3070+
mono_mb_emit_i4 (mb, GPTRDIFF_TO_INT32 (mono_jit_icall_info_index (callinfo)));
30713071
mono_mb_emit_calli (mb, csig2);
30723072
if (check_exceptions)
30733073
emit_thread_interrupt_checkpoint (mb);

‎src/mono/mono/mini/interp/transform.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ get_data_item_index_imethod (TransformData *td, InterpMethod *imethod)
11081108
g_assertf (index <= G_MAXUINT16, "Interpreter data item index 0x%x for method '%s' overflows", index, td->method->name);
11091109
if (new_slot && imethod && !imethod->optimized)
11101110
td->imethod_items = g_slist_prepend (td->imethod_items, (gpointer)(gsize)index);
1111-
return index;
1111+
return GUINT32_TO_UINT16 (index);
11121112
}
11131113

11141114
static gboolean
@@ -6766,7 +6766,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
67666766
td->patchpoint_data_n++;
67676767
interp_add_ins (td, MINT_TIER_PATCHPOINT_DATA);
67686768
call_handler_count++;
6769-
td->last_ins->data [0] = call_handler_count;
6769+
td->last_ins->data [0] = GINT_TO_UINT16 (call_handler_count);
67706770
g_assert (call_handler_count < G_MAXUINT16);
67716771
}
67726772
}

0 commit comments

Comments
 (0)