Skip to content

[mono] Fix a few corner case overflow operations #58114

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
merged 4 commits into from
Aug 26, 2021
Merged

[mono] Fix a few corner case overflow operations #58114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
996e256
[mono][jit] Fix invalid uses of SHL instead of MUL optimization
BrzVlad Aug 14, 2021
8b23c56
Enable tests
BrzVlad Aug 14, 2021
5aa26cd
[interp] Fix a few overflow conversions
BrzVlad Aug 14, 2021
2726657
[interp] Extract some conversion logic in mono-math.h
BrzVlad Aug 26, 2021
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
74 changes: 42 additions & 32 deletions src/mono/mono/mini/interp/interp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5472,33 +5472,29 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_U8_R4) {
float val = LOCAL_VAR (ip [2], float);
if (mono_isnan (val) || mono_trunc (val) != (guint64)val)
if (!mono_try_trunc_u64 (val, (guint64*)(locals + ip [1])))
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], guint64) = (guint64)val;
ip += 3;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_U8_R8) {
double val = LOCAL_VAR (ip [2], double);
if (mono_isnan (val) || mono_trunc (val) != (guint64)val)
if (!mono_try_trunc_u64 (val, (guint64*)(locals + ip [1])))
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], guint64) = (guint64)val;
ip += 3;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_I8_R4) {
float val = LOCAL_VAR (ip [2], float);
if (mono_isnan (val) || mono_trunc (val) != (gint64)val)
if (!mono_try_trunc_i64 (val, (gint64*)(locals + ip [1])))
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint64) = (gint64)val;
ip += 3;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_I8_R8) {
double val = LOCAL_VAR (ip [2], double);
if (mono_isnan (val) || mono_trunc (val) != (gint64)val)
if (!mono_try_trunc_i64 (val, (gint64*)(locals + ip [1])))
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint64) = (gint64)val;
ip += 3;
MINT_IN_BREAK;
}
Expand Down Expand Up @@ -5800,17 +5796,20 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_I4_R4) {
float val = LOCAL_VAR (ip [2], float);
if (mono_isnan (val) || mono_trunc (val) != (gint32)val)
double val_r8 = (double)val;
if (val_r8 > ((double)G_MININT32 - 1) && val_r8 < ((double)G_MAXINT32 + 1))
LOCAL_VAR (ip [1], gint32) = (gint32) val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (gint32) val;
ip += 3;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_I4_R8) {
double val = LOCAL_VAR (ip [2], double);
if (val < G_MININT32 || val > G_MAXINT32 || isnan (val))
if (val > ((double)G_MININT32 - 1) && val < ((double)G_MAXINT32 + 1))
LOCAL_VAR (ip [1], gint32) = (gint32) val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (gint32)val;
ip += 3;
MINT_IN_BREAK;
}
Expand All @@ -5832,17 +5831,20 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_U4_R4) {
float val = LOCAL_VAR (ip [2], float);
if (mono_isnan (val) || mono_trunc (val) != (guint32)val)
double val_r8 = val;
if (val_r8 > -1.0 && val_r8 < ((double)G_MAXUINT32 + 1))
LOCAL_VAR (ip [1], gint32) = (guint32)val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (guint32)val;
ip += 3;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_U4_R8) {
double val = LOCAL_VAR (ip [2], double);
if (val < 0 || val > G_MAXUINT32 || isnan (val))
if (val > -1.0 && val < ((double)G_MAXUINT32 + 1))
LOCAL_VAR (ip [1], gint32) = (guint32)val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (guint32) val;
ip += 3;
MINT_IN_BREAK;
}
Expand Down Expand Up @@ -5880,17 +5882,19 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_I2_R4) {
float val = LOCAL_VAR (ip [2], float);
if (val < G_MININT16 || val > G_MAXINT16 || isnan (val))
if (val > (G_MININT16 - 1) && val < (G_MAXINT16 + 1))
LOCAL_VAR (ip [1], gint32) = (gint16) val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (gint16) val;
ip += 3;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_I2_R8) {
double val = LOCAL_VAR (ip [2], double);
if (val < G_MININT16 || val > G_MAXINT16 || isnan (val))
if (val > (G_MININT16 - 1) && val < (G_MAXINT16 + 1))
LOCAL_VAR (ip [1], gint32) = (gint16) val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (gint16) val;
ip += 3;
MINT_IN_BREAK;
}
Expand All @@ -5912,17 +5916,19 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_U2_R4) {
float val = LOCAL_VAR (ip [2], float);
if (val < 0 || val > G_MAXUINT16 || isnan (val))
if (val > -1.0f && val < (G_MAXUINT16 + 1))
LOCAL_VAR (ip [1], gint32) = (guint16) val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (guint16) val;
ip += 3;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_U2_R8) {
double val = LOCAL_VAR (ip [2], double);
if (val < 0 || val > G_MAXUINT16 || isnan (val))
if (val > -1.0 && val < (G_MAXUINT16 + 1))
LOCAL_VAR (ip [1], gint32) = (guint16) val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (guint16) val;
ip += 3;
MINT_IN_BREAK;
}
Expand Down Expand Up @@ -5960,17 +5966,19 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_I1_R4) {
float val = LOCAL_VAR (ip [2], float);
if (val < G_MININT8 || val > G_MAXINT8 || isnan (val))
if (val > (G_MININT8 - 1) && val < (G_MAXINT8 + 1))
LOCAL_VAR (ip [1], gint32) = (gint8) val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (gint8) val;
ip += 3;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_I1_R8) {
double val = LOCAL_VAR (ip [2], double);
if (val < G_MININT8 || val > G_MAXINT8 || isnan (val))
if (val > (G_MININT8 - 1) && val < (G_MAXINT8 + 1))
LOCAL_VAR (ip [1], gint32) = (gint8) val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (gint8) val;
ip += 3;
MINT_IN_BREAK;
}
Expand All @@ -5992,17 +6000,19 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_U1_R4) {
float val = LOCAL_VAR (ip [2], float);
if (val < 0 || val > G_MAXUINT8 || isnan (val))
if (val > -1.0f && val < (G_MAXUINT8 + 1))
LOCAL_VAR (ip [1], gint32) = (guint8)val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (guint8) val;
ip += 3;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_U1_R8) {
double val = LOCAL_VAR (ip [2], double);
if (val < 0 || val > G_MAXUINT8 || isnan (val))
if (val > -1.0 && val < (G_MAXUINT8 + 1))
LOCAL_VAR (ip [1], gint32) = (guint8)val;
else
THROW_EX (mono_get_exception_overflow (), ip);
LOCAL_VAR (ip [1], gint32) = (guint8) val;
ip += 3;
MINT_IN_BREAK;
}
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/mini/local-propagation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ mono_strength_reduction_division (MonoCompile *cfg, MonoInst *ins)
guint32 tmp_regi;
#endif
struct magic_signed mag;
int power2 = mono_is_power_of_two (ins->inst_imm);
int power2 = (ins->inst_imm > 0) ? mono_is_power_of_two (ins->inst_imm) : -1;
/* The decomposition doesn't handle exception throwing */
/* Optimization with MUL does not apply for -1, 0 and 1 divisors */
if (ins->inst_imm == 0 || ins->inst_imm == -1) {
Expand Down Expand Up @@ -350,7 +350,7 @@ mono_strength_reduction_ins (MonoCompile *cfg, MonoInst *ins, const char **spec)
ins->opcode = OP_INEG;
} else if ((ins->opcode == OP_LMUL_IMM) && (ins->inst_imm == -1)) {
ins->opcode = OP_LNEG;
} else {
} else if (ins->inst_imm > 0) {
int power2 = mono_is_power_of_two (ins->inst_imm);
if (power2 >= 0) {
ins->opcode = (ins->opcode == OP_MUL_IMM) ? OP_SHL_IMM : ((ins->opcode == OP_LMUL_IMM) ? OP_LSHL_IMM : OP_ISHL_IMM);
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/mini-arm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3466,7 +3466,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
ins->inst_c0 = 0;
break;
}
imm8 = mono_is_power_of_two (ins->inst_imm);
imm8 = (ins->inst_imm > 0) ? mono_is_power_of_two (ins->inst_imm) : -1;
if (imm8 > 0) {
ins->opcode = OP_SHL_IMM;
ins->inst_imm = imm8;
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/mini/mini-mips.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1987,7 +1987,7 @@ mono_arch_peephole_pass_2 (MonoCompile *cfg, MonoBasicBlock *bb)
MONO_DELETE_INS (bb, ins);
continue;
}
} else {
} else if (ins->inst_imm > 0) {
int power2 = mono_is_power_of_two (ins->inst_imm);
if (power2 > 0) {
ins->opcode = OP_SHL_IMM;
Expand Down Expand Up @@ -2666,7 +2666,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
ins->inst_c0 = 0;
break;
}
imm = mono_is_power_of_two (ins->inst_imm);
imm = (ins->inst_imm > 0) ? mono_is_power_of_two (ins->inst_imm) : -1;
if (imm > 0) {
ins->opcode = OP_SHL_IMM;
ins->inst_imm = imm;
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/mini/mini-ppc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,7 +1963,7 @@ mono_arch_peephole_pass_2 (MonoCompile *cfg, MonoBasicBlock *bb)
MONO_DELETE_INS (bb, ins);
continue;
}
} else {
} else if (inst->inst_imm > 0) {
int power2 = mono_is_power_of_two (ins->inst_imm);
if (power2 > 0) {
ins->opcode = OP_SHL_IMM;
Expand Down Expand Up @@ -2537,7 +2537,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
ins->inst_c0 = 0;
break;
}
imm = mono_is_power_of_two (ins->inst_imm);
imm = (ins->inst_imm > 0) ? mono_is_power_of_two (ins->inst_imm) : -1;
if (imm > 0) {
ins->opcode = OP_SHL_IMM;
ins->inst_imm = imm;
Expand Down
24 changes: 24 additions & 0 deletions src/mono/mono/utils/mono-math.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <math.h>
#include <mono/utils/mono-publib.h>
#include <glib.h>

// Instead of isfinite, isinf, isnan, etc.,
// use mono_isfininite, mono_isinf, mono_isnan, etc.
Expand Down Expand Up @@ -99,4 +100,27 @@ mono_round_to_even (double x)
return copysign (floor_tmp, x);
}

static inline gboolean
mono_try_trunc_i64 (double val, gint64 *out)
{
const double two63 = 2147483648.0 * 4294967296.0;
// 0x402 is epsilon used to get us to the next value
if (val > (-two63 - 0x402) && val < two63) {
*out = (gint64)val;
return TRUE;
}
return FALSE;
}

static inline gboolean
mono_try_trunc_u64 (double val, guint64 *out)
{
const double two64 = 4294967296.0 * 4294967296.0;
if (val > -1.0 && val < two64) {
*out = (guint64)val;
return TRUE;
}
return FALSE;
}

#endif
21 changes: 0 additions & 21 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,27 +965,9 @@
</ExcludeList>


<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/Convert/value_numbering_checked_casts_of_constants/*">
<Issue>https://github.com/dotnet/runtime/issues/51323</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/int64/misc/longmul/*">
<Issue>https://github.com/dotnet/runtime/issues/51323</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/Convert/out_of_range_fp_to_int_conversions/*">
<Issue>Mono does not define out of range fp to int conversions</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Overflow/FloatOvfToInt2_r/*">
<Issue>https://github.com/dotnet/runtime/issues/51323</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Overflow/FloatOvfToInt2_ro/*">
<Issue>https://github.com/dotnet/runtime/issues/51323</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Overflow/FloatOvfToInt2_d/*">
<Issue>https://github.com/dotnet/runtime/issues/51323</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Overflow/FloatOvfToInt2_do/*">
<Issue>https://github.com/dotnet/runtime/issues/51323</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/opt/Devirtualization/Comparer_get_Default/*">
<Issue>https://github.com/dotnet/runtime/issues/48190</Issue>
</ExcludeList>
Expand Down Expand Up @@ -1239,9 +1221,6 @@
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/Convert/ldind_conv/**">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned/**">
<Issue>https://github.com/dotnet/runtime/issues/51323</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/coverage/compiler/FilterToHandler/**">
<Issue>needs triage</Issue>
</ExcludeList>
Expand Down