wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-19 21:57:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Restrict ExtractLinearSum to monotonous operation in infinite math space.

Browse source 
Thanks to Bruno Keith & Niklas Baumstark from the phoenhex team for
finding this issue and reporting it with a proper analysis.
This commit is contained in:
Nicolas B. Pierron 2019-03-23 09:36:15 +01:00 • committed by Roy Tam
commit e390f01ef5
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
js/src/jit/IonAnalysis.cpp
View file

@ -3127,6 +3127,15 @@ ExtractMathSpace(MDefinition* ins)
MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("Unknown TruncateKind"); MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("Unknown TruncateKind");
} }
static bool MonotoneAdd(int32_t lhs, int32_t rhs) {
return (lhs >= 0 && rhs >= 0) || (lhs <= 0 && rhs <= 0);
}
static bool MonotoneSub(int32_t lhs, int32_t rhs) {
return (lhs >= 0 && rhs <= 0) || (lhs <= 0 && rhs >= 0);
}
// Extract a linear sum from ins, if possible (otherwise giving the sum 'ins + 0'). // Extract a linear sum from ins, if possible (otherwise giving the sum 'ins + 0').
SimpleLinearSum SimpleLinearSum
jit::ExtractLinearSum(MDefinition* ins, MathSpace space) jit::ExtractLinearSum(MDefinition* ins, MathSpace space)
@ -3168,10 +3177,12 @@ jit::ExtractLinearSum(MDefinition* ins, MathSpace space)
// Check if this is of the form <SUM> + n or n + <SUM>. // Check if this is of the form <SUM> + n or n + <SUM>.
if (ins->isAdd()) { if (ins->isAdd()) {
int32_t constant; int32_t constant;
if (space == MathSpace::Modulo) if (space == MathSpace::Modulo) {
constant = lsum.constant + rsum.constant; constant = lsum.constant + rsum.constant;
else if (!SafeAdd(lsum.constant, rsum.constant, &constant)) } else if (!SafeAdd(lsum.constant, rsum.constant, &constant) ||
!MonotoneAdd(lsum.constant, rsum.constant)) {
return SimpleLinearSum(ins, 0); return SimpleLinearSum(ins, 0);
}
return SimpleLinearSum(lsum.term ? lsum.term : rsum.term, constant); return SimpleLinearSum(lsum.term ? lsum.term : rsum.term, constant);
} }
@ -3179,10 +3190,12 @@ jit::ExtractLinearSum(MDefinition* ins, MathSpace space)
// Check if this is of the form <SUM> - n. // Check if this is of the form <SUM> - n.
if (lsum.term) { if (lsum.term) {
int32_t constant; int32_t constant;
if (space == MathSpace::Modulo) if (space == MathSpace::Modulo) {
constant = lsum.constant - rsum.constant; constant = lsum.constant - rsum.constant;
else if (!SafeSub(lsum.constant, rsum.constant, &constant)) } else if (!SafeSub(lsum.constant, rsum.constant, &constant) ||
!MonotoneSub(lsum.constant, rsum.constant)) {
return SimpleLinearSum(ins, 0); return SimpleLinearSum(ins, 0);
}
return SimpleLinearSum(lsum.term, constant); return SimpleLinearSum(lsum.term, constant);
} }