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 1915a343a3fca3e9f7dda14e73746d68b59d8f08
2 changes: 1 addition & 1 deletion src/coreclr/pal/inc/pal_endian.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
extern "C++" {
inline UINT16 SWAP16(UINT16 x)
{
return (x >> 8) | (x << 8);
return (UINT16)((x >> 8) | (x << 8));
}

inline UINT32 SWAP32(UINT32 x)
Expand Down
2 changes: 1 addition & 1 deletion src/mono/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ if(GCC)
set(WARNINGS "${WARNINGS} -Qunused-arguments -Wno-tautological-compare -Wno-parentheses-equality -Wno-self-assign -Wno-return-stack-address -Wno-constant-logical-operand -Wno-zero-length-array -Wno-asm-operand-widths")
set(WERROR "${WERROR} -Werror=implicit-int-conversion")
else()
set(WERROR "${WERROR} -Werror=no-int-conversion")
set(WERROR_C "${WERROR_C} -Werror=no-int-conversion")
endif()

check_c_compiler_flag("-Werror=incompatible-pointer-types" WERROR_INCOMPATIBLE_POINTER_TYPES)
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2839,7 +2839,7 @@ interp_inline_newobj (TransformData *td, MonoMethod *target_method, MonoMethodSi
newobj_fast = interp_add_ins (td, MINT_NEWOBJ_VT_INLINED);
interp_ins_set_dreg (newobj_fast, this_reg);
interp_ins_set_sreg (newobj_fast, dreg);
newobj_fast->data [0] = ALIGN_TO (vtsize, MINT_STACK_SLOT_SIZE);
newobj_fast->data [0] = GUINTPTR_TO_UINT16 (ALIGN_TO (vtsize, MINT_STACK_SLOT_SIZE));
} else {
MonoVTable *vtable = mono_class_vtable_checked (klass, error);
goto_if_nok (error, fail);
Expand Down Expand Up @@ -5638,7 +5638,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
if (is_vt) {
newobj_fast = interp_add_ins (td, MINT_NEWOBJ_VT);
interp_ins_set_dreg (newobj_fast, dreg);
newobj_fast->data [1] = ALIGN_TO (vtsize, MINT_STACK_SLOT_SIZE);
newobj_fast->data [1] = GUINTPTR_TO_UINT16 (ALIGN_TO (vtsize, MINT_STACK_SLOT_SIZE));
} else {
MonoVTable *vtable = mono_class_vtable_checked (klass, error);
goto_if_nok (error, exit);
Expand Down
14 changes: 7 additions & 7 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 @@ -3449,7 +3449,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
ins->sreg2 = temp->dreg;
if (opcode2 == -1)
g_error ("mono_op_imm_to_op failed for %s\n", mono_inst_name (ins->opcode));
ins->opcode = opcode2;
ins->opcode = GINT32_TO_UINT16 (opcode2);
}
if (ins->opcode == OP_SBB || ins->opcode == OP_ISBB || ins->opcode == OP_SUBCC)
goto loop_start;
Expand Down Expand Up @@ -3507,7 +3507,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
ins->sreg2 = temp->dreg;
if (opcode2 == -1)
g_error ("mono_op_imm_to_op failed for %s\n", mono_inst_name (ins->opcode));
ins->opcode = opcode2;
ins->opcode = GINT32_TO_UINT16 (opcode2);
break;
}
case OP_LOCALLOC_IMM:
Expand All @@ -3532,7 +3532,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
temp->inst_c0 = ins->inst_offset;
temp->dreg = mono_alloc_ireg (cfg);
ins->sreg2 = temp->dreg;
ins->opcode = map_to_reg_reg_op (ins->opcode);
ins->opcode = GINT32_TO_UINT16 (map_to_reg_reg_op (ins->opcode));
break;
case OP_LOADI2_MEMBASE:
case OP_LOADU2_MEMBASE:
Expand All @@ -3543,7 +3543,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
temp->inst_c0 = ins->inst_offset;
temp->dreg = mono_alloc_ireg (cfg);
ins->sreg2 = temp->dreg;
ins->opcode = map_to_reg_reg_op (ins->opcode);
ins->opcode = GINT32_TO_UINT16 (map_to_reg_reg_op (ins->opcode));
break;
case OP_LOADR4_MEMBASE:
case OP_LOADR8_MEMBASE:
Expand Down Expand Up @@ -3582,7 +3582,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
temp->inst_c0 = ins->inst_offset;
temp->dreg = mono_alloc_ireg (cfg);
ins->sreg2 = temp->dreg;
ins->opcode = map_to_reg_reg_op (ins->opcode);
ins->opcode = GINT32_TO_UINT16 (map_to_reg_reg_op (ins->opcode));
break;
case OP_STOREI2_MEMBASE_REG:
if (arm_is_imm8 (ins->inst_offset))
Expand All @@ -3591,7 +3591,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
temp->inst_c0 = ins->inst_offset;
temp->dreg = mono_alloc_ireg (cfg);
ins->sreg2 = temp->dreg;
ins->opcode = map_to_reg_reg_op (ins->opcode);
ins->opcode = GINT32_TO_UINT16 (map_to_reg_reg_op (ins->opcode));
break;
case OP_STORER4_MEMBASE_REG:
case OP_STORER8_MEMBASE_REG:
Expand Down Expand Up @@ -3629,7 +3629,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
temp->inst_c0 = ins->inst_imm;
temp->dreg = mono_alloc_ireg (cfg);
ins->sreg1 = temp->dreg;
ins->opcode = map_to_reg_reg_op (ins->opcode);
ins->opcode = GINT32_TO_UINT16 (map_to_reg_reg_op (ins->opcode));
last_ins = temp;
goto loop_start; /* make it handle the possibly big ins->inst_offset */
case OP_FCOMPARE:
Expand Down
10 changes: 5 additions & 5 deletions src/mono/mono/mini/mini-unwind.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ typedef struct {
/* Set cfa to reg+offset */
#define mono_emit_unwind_op_def_cfa(cfg,ip,reg,offset) do { mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_def_cfa, (reg), (offset)); (cfg)->cur_cfa_reg = (reg); (cfg)->cur_cfa_offset = (offset); } while (0)
/* Set cfa to reg+existing offset */
#define mono_emit_unwind_op_def_cfa_reg(cfg,ip,reg) do { mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_def_cfa_register, (reg), (0)); (cfg)->cur_cfa_reg = (reg); } while (0)
#define mono_emit_unwind_op_def_cfa_reg(cfg,ip,reg) do { mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_def_cfa_register, (uint16_t)(reg), (0)); (cfg)->cur_cfa_reg = (reg); } while (0)
/* Set cfa to existing reg+offset */
#define mono_emit_unwind_op_def_cfa_offset(cfg,ip,offset) do { mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_def_cfa_offset, (0), (offset)); (cfg)->cur_cfa_offset = (offset); } while (0)
/* Reg is the same as it was on enter to the function */
#define mono_emit_unwind_op_same_value(cfg,ip,reg) mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_same_value, (reg), 0)
#define mono_emit_unwind_op_same_value(cfg,ip,reg) mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_same_value, (uint16_t)(reg), 0)
/* Reg is saved at cfa+offset */
#define mono_emit_unwind_op_offset(cfg,ip,reg,offset) mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_offset, (reg), (offset))
#define mono_emit_unwind_op_offset(cfg,ip,reg,offset) mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_offset, (uint16_t)(reg), (offset))
/* Save the unwind state into an implicit stack */
#define mono_emit_unwind_op_remember_state(cfg,ip) mono_emit_unwind_op (cfg, (ip) - (cfg)->native_code, DW_CFA_remember_state, 0, 0)
/* Restore the unwind state from the state stack */
Expand All @@ -125,11 +125,11 @@ typedef struct {
#endif

/* Similar macros usable when a cfg is not available, like for trampolines */
#define mono_add_unwind_op_def_cfa(op_list,code,buf,reg,offset) do { (op_list) = g_slist_append ((op_list), mono_create_unwind_op ((code) - (buf), DW_CFA_def_cfa, (reg), (offset))); } while (0)
#define mono_add_unwind_op_def_cfa(op_list,code,buf,reg,offset) do { (op_list) = g_slist_append ((op_list), mono_create_unwind_op ((code) - (buf), DW_CFA_def_cfa, (uint16_t)(reg), (offset))); } while (0)
#define mono_add_unwind_op_def_cfa_reg(op_list,code,buf,reg) do { (op_list) = g_slist_append ((op_list), mono_create_unwind_op ((code) - (buf), DW_CFA_def_cfa_register, (reg), (0))); } while (0)
#define mono_add_unwind_op_def_cfa_offset(op_list,code,buf,offset) do { (op_list) = g_slist_append ((op_list), mono_create_unwind_op ((code) - (buf), DW_CFA_def_cfa_offset, 0, (offset))); } while (0)
#define mono_add_unwind_op_same_value(op_list,code,buf,reg) do { (op_list) = g_slist_append ((op_list), mono_create_unwind_op ((code) - (buf), DW_CFA_same_value, (reg), 0)); } while (0)
#define mono_add_unwind_op_offset(op_list,code,buf,reg,offset) do { (op_list) = g_slist_append ((op_list), mono_create_unwind_op ((code) - (buf), DW_CFA_offset, (reg), (offset))); } while (0)
#define mono_add_unwind_op_offset(op_list,code,buf,reg,offset) do { (op_list) = g_slist_append ((op_list), mono_create_unwind_op ((code) - (buf), DW_CFA_offset, (uint16_t)(reg), (offset))); } while (0)

#if defined(TARGET_WIN32) && defined(TARGET_AMD64)
#define mono_add_unwind_op_sp_alloc(op_list,code,buf,size) do { (op_list) = g_slist_append ((op_list), mono_create_unwind_op ((code) - (buf), DW_CFA_mono_sp_alloc_info_win64, 0, (size))); } while (0)
Expand Down