Skip to content

Reenable C4244 in repo #70026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AaronRobinsonMSFT merged 20 commits into from
Jun 14, 2022
Merged

Reenable C4244 in repo #70026

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6c29b7c
Reenable 4244 warning for Mono.
AaronRobinsonMSFT May 31, 2022
2e6f9d1
Enable compiler errors for gcc/clang.
AaronRobinsonMSFT Jun 1, 2022
adcceba
Fix issues enabling -Werror=implicit-int-conversion
AaronRobinsonMSFT Jun 1, 2022
3406b91
More violations
AaronRobinsonMSFT Jun 1, 2022
0bd86a2
More violations
AaronRobinsonMSFT Jun 1, 2022
1915a34
More violations
AaronRobinsonMSFT Jun 1, 2022
e753237
More violations
AaronRobinsonMSFT Jun 1, 2022
9016821
More violations
AaronRobinsonMSFT Jun 3, 2022
e776f5f
More violations
AaronRobinsonMSFT Jun 6, 2022
2ee634b
More violations
AaronRobinsonMSFT Jun 7, 2022
608d3e5
More violations
AaronRobinsonMSFT Jun 7, 2022
4013d1a
More violations
AaronRobinsonMSFT Jun 7, 2022
7a9e1ff
More violations
AaronRobinsonMSFT Jun 7, 2022
4030b47
More violations
AaronRobinsonMSFT Jun 8, 2022
7ae1382
More violations
AaronRobinsonMSFT Jun 8, 2022
69c5467
More violations
AaronRobinsonMSFT Jun 8, 2022
4d64bdb
More violations
AaronRobinsonMSFT Jun 8, 2022
b3ddeae
More violations
AaronRobinsonMSFT Jun 8, 2022
4b83ea8
Revert turning on implicit-int-conversion as error.
AaronRobinsonMSFT Jun 9, 2022
54fae18
Review feedback
AaronRobinsonMSFT Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More violations
  • Loading branch information
@AaronRobinsonMSFT
AaronRobinsonMSFT committed Jun 1, 2022
commit 0bd86a257fa881e85f89f3ec5e0a19d1502fc03f
17 changes: 9 additions & 8 deletions src/mono/mono/mini/mini-amd64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ add_general (guint32 *gr, guint32 *stack_size, ArgInfo *ainfo)
(*stack_size) += sizeof (target_mgreg_t);
} else {
ainfo->storage = ArgInIReg;
ainfo->reg = param_regs [*gr];
ainfo->reg = GINT32_TO_UINT8 (param_regs [*gr]);
(*gr) ++;
}
}
Expand Down Expand Up @@ -676,7 +676,7 @@ add_valuetype (MonoMethodSignature *sig, ArgInfo *ainfo, MonoType *type,

if (pass_on_stack) {
/* Allways pass in memory */
ainfo->offset = *stack_size;
ainfo->offset = GINT32_TO_INT16 (*stack_size);
*stack_size += ALIGN_TO (size, 8);
ainfo->storage = is_return ? ArgValuetypeAddrInIReg : ArgOnStack;
if (!is_return)
Expand Down Expand Up @@ -718,7 +718,7 @@ add_valuetype (MonoMethodSignature *sig, ArgInfo *ainfo, MonoType *type,
}

if (struct_size > 16) {
ainfo->offset = *stack_size;
ainfo->offset = GINT32_TO_INT16 (*stack_size);
*stack_size += ALIGN_TO (struct_size, 8);
ainfo->storage = is_return ? ArgValuetypeAddrInIReg : ArgOnStack;
if (!is_return)
Expand Down Expand Up @@ -793,9 +793,9 @@ add_valuetype (MonoMethodSignature *sig, ArgInfo *ainfo, MonoType *type,
else {
ainfo->pair_storage [quad] = ArgInIReg;
if (is_return)
ainfo->pair_regs [quad] = return_regs [*gr];
ainfo->pair_regs [quad] = GINT32_TO_UINT8 (return_regs [*gr]);
else
ainfo->pair_regs [quad] = param_regs [*gr];
ainfo->pair_regs [quad] = GINT32_TO_UINT8 (param_regs [*gr]);
(*gr) ++;
}
break;
Expand All @@ -805,8 +805,9 @@ add_valuetype (MonoMethodSignature *sig, ArgInfo *ainfo, MonoType *type,
else {
if (quadsize[quad] <= 4)
ainfo->pair_storage [quad] = ArgInFloatSSEReg;
else ainfo->pair_storage [quad] = ArgInDoubleSSEReg;
ainfo->pair_regs [quad] = *fr;
else
ainfo->pair_storage [quad] = ArgInDoubleSSEReg;
ainfo->pair_regs [quad] = GINT32_TO_UINT8 (*fr);
(*fr) ++;
}
break;
Expand All @@ -825,7 +826,7 @@ add_valuetype (MonoMethodSignature *sig, ArgInfo *ainfo, MonoType *type,
*gr = orig_gr;
*fr = orig_fr;

ainfo->offset = *stack_size;
ainfo->offset = GINT32_TO_UINT16 (*stack_size);
if (sig->pinvoke)
arg_size = ALIGN_TO (struct_size, 8);
else
Expand Down
44 changes: 22 additions & 22 deletions src/mono/mono/mini/mini-arm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,14 +598,14 @@ mono_arch_get_argument_info (MonoMethodSignature *csig, int param_count, MonoJit
offset += 4;
}

arg_info [0].offset = offset;
arg_info [0].offset = GINT32_TO_UINT16 (offset);

if (csig->hasthis) {
frame_size += sizeof (target_mgreg_t);
offset += 4;
}

arg_info [0].size = frame_size;
arg_info [0].size = GINT32_TO_UINT16 (frame_size);

for (k = 0; k < param_count; k++) {
size = mini_type_stack_size_full (csig->params [k], &align, csig->pinvoke && !csig->marshalling_disabled);
Expand All @@ -614,18 +614,18 @@ mono_arch_get_argument_info (MonoMethodSignature *csig, int param_count, MonoJit
align = 1;

frame_size += pad = (align - (frame_size & (align - 1))) & (align - 1);
arg_info [k].pad = pad;
arg_info [k].pad = GUINT32_TO_UINT8 (pad);
frame_size += size;
arg_info [k + 1].pad = 0;
arg_info [k + 1].size = size;
arg_info [k + 1].size = GINT32_TO_UINT16 (size);
offset += pad;
arg_info [k + 1].offset = offset;
arg_info [k + 1].offset = GINT32_TO_UINT16 (offset);
offset += size;
}

align = MONO_ARCH_FRAME_ALIGNMENT;
frame_size += pad = (align - (frame_size & (align - 1))) & (align - 1);
arg_info [k].pad = pad;
arg_info [k].pad = GUINT32_TO_UINT8 (pad);

return frame_size;
}
Expand Down Expand Up @@ -1083,7 +1083,7 @@ add_general (guint *gr, guint *stack_size, ArgInfo *ainfo, gboolean simple)
*stack_size += 4;
} else {
ainfo->storage = RegTypeGeneral;
ainfo->reg = *gr;
ainfo->reg = GUINT32_TO_UINT8 (*gr);
}
} else {
gboolean split;
Expand Down Expand Up @@ -1118,7 +1118,7 @@ add_general (guint *gr, guint *stack_size, ArgInfo *ainfo, gboolean simple)
(*gr) ++;
}
ainfo->storage = RegTypeIRegPair;
ainfo->reg = *gr;
ainfo->reg = GUINT32_TO_UINT8 (*gr);
}
(*gr) ++;
}
Expand Down Expand Up @@ -1170,7 +1170,7 @@ add_float (guint *fpr, guint *stack_size, ArgInfo *ainfo, gboolean is_double, gi
* At this point, we have an even register
* so we assign that and move along.
*/
ainfo->reg = *fpr;
ainfo->reg = GUINT32_TO_UINT8 (*fpr);
*fpr += 2;
} else if (*float_spare >= 0) {
/*
Expand All @@ -1180,7 +1180,7 @@ add_float (guint *fpr, guint *stack_size, ArgInfo *ainfo, gboolean is_double, gi
* use it.
*/

ainfo->reg = *float_spare;
ainfo->reg = GINT32_TO_UINT8 (*float_spare);
*float_spare = -1;
} else {
/*
Expand All @@ -1189,7 +1189,7 @@ add_float (guint *fpr, guint *stack_size, ArgInfo *ainfo, gboolean is_double, gi
* use the next available register.
*/

ainfo->reg = *fpr;
ainfo->reg = GUINT32_TO_UINT8 (*fpr);
(*fpr)++;
}
} else {
Expand Down Expand Up @@ -1387,7 +1387,7 @@ get_call_info (MonoMemPool *mp, MonoMethodSignature *sig)
pstart = 1;
}
n ++;
cinfo->ret.reg = gr;
cinfo->ret.reg = GUINT32_TO_UINT8 (gr);
gr ++;
cinfo->vret_arg_index = 1;
} else {
Expand All @@ -1397,7 +1397,7 @@ get_call_info (MonoMemPool *mp, MonoMethodSignature *sig)
n ++;
}
if (vtype_retaddr) {
cinfo->ret.reg = gr;
cinfo->ret.reg = GUINT32_TO_UINT8 (gr);
gr ++;
}
}
Expand Down Expand Up @@ -1480,7 +1480,7 @@ get_call_info (MonoMemPool *mp, MonoMethodSignature *sig)
if (IS_HARD_FLOAT && sig->pinvoke && is_hfa (t, &nfields, &esize)) {
if (fpr + nfields < ARM_VFP_F16) {
ainfo->storage = RegTypeHFA;
ainfo->reg = fpr;
ainfo->reg = GUINT32_TO_UINT8 (fpr);
ainfo->nregs = nfields;
ainfo->esize = esize;
if (esize == 4)
Expand Down Expand Up @@ -1540,14 +1540,14 @@ get_call_info (MonoMemPool *mp, MonoMethodSignature *sig)
}
if (gr > ARMREG_R3) {
ainfo->size = 0;
ainfo->vtsize = nwords;
ainfo->vtsize = GINT32_TO_UINT16 (nwords);
} else {
int rest = ARMREG_R3 - gr + 1;
int n_in_regs = rest >= nwords? nwords: rest;

ainfo->size = n_in_regs;
ainfo->vtsize = nwords - n_in_regs;
ainfo->reg = gr;
ainfo->size = GINT32_TO_UINT8 (n_in_regs);
ainfo->vtsize = GINT32_TO_UINT16 (nwords - n_in_regs);
ainfo->reg = GUINT32_TO_UINT8 (gr);
gr += n_in_regs;
nwords -= n_in_regs;
}
Expand Down Expand Up @@ -3100,16 +3100,16 @@ mono_arch_finish_dyn_call (MonoDynCallInfo *info, guint8 *buf)
*(gpointer*)ret = (gpointer)(gsize)res;
break;
case MONO_TYPE_I1:
*(gint8*)ret = res;
*(gint8*)ret = GINT32_TO_INT8 (res);
break;
case MONO_TYPE_U1:
*(guint8*)ret = res;
*(guint8*)ret = GINT32_TO_UINT8 (res);
break;
case MONO_TYPE_I2:
*(gint16*)ret = res;
*(gint16*)ret = GINT32_TO_INT16 (res);
break;
case MONO_TYPE_U2:
*(guint16*)ret = res;
*(guint16*)ret = GINT32_TO_UINT16 (res);
break;
case MONO_TYPE_I4:
*(gint32*)ret = res;
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/mini/mini-x86.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,10 @@ add_valuetype (MonoMethodSignature *sig, ArgInfo *ainfo, MonoType *type,
if ((info->native_size == 1) || (info->native_size == 2) || (info->native_size == 4) || (info->native_size == 8)) {
ainfo->storage = ArgValuetypeInReg;
ainfo->pair_storage [0] = ArgInIReg;
ainfo->pair_regs [0] = return_regs [0];
ainfo->pair_regs [0] = GINT32_TO_UINT8 (return_regs [0]);
if (info->native_size > 4) {
ainfo->pair_storage [1] = ArgInIReg;
ainfo->pair_regs [1] = return_regs [1];
ainfo->pair_regs [1] = GINT32_TO_UINT8 (return_regs [1]);
}
return;
}
Expand Down
6 changes: 3 additions & 3 deletions src/native/eventpipe/ds-ipc-pal-socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ ipc_alloc_tcp_address (

const ep_char8_t *host_address = address;
const ep_char8_t *host_port = strrchr (address, ':');

if (host_port && host_port != host_address) {
size_t host_address_len = host_port - address;
address [host_address_len] = 0;
Expand Down Expand Up @@ -884,7 +884,7 @@ ipc_alloc_tcp_address (
if (!ipc->server_address && info->ai_family == AF_INET) {
server_address = ep_rt_object_alloc (struct sockaddr_in);
if (server_address) {
server_address->sin_family = info->ai_family;
server_address->sin_family = GINT32_TO_UINT8 (info->ai_family);
server_address->sin_port = htons (port);
server_address->sin_addr = ((struct sockaddr_in*)info->ai_addr)->sin_addr;
ipc->server_address = (ds_ipc_socket_address_t *)server_address;
Expand All @@ -898,7 +898,7 @@ ipc_alloc_tcp_address (
if (!ipc->server_address && info->ai_family == AF_INET6) {
server_address6 = ep_rt_object_alloc (struct sockaddr_in6);
if (server_address6) {
server_address6->sin6_family = info->ai_family;
server_address6->sin6_family = GINT32_TO_UINT8 (info->ai_family);
server_address6->sin6_port = htons (port);
server_address6->sin6_addr = ((struct sockaddr_in6*)info->ai_addr)->sin6_addr;
ipc->server_address = (ds_ipc_socket_address_t *)server_address6;
Expand Down