Skip to content

Commit

Permalink
Fix constant folding of division and reminder with zero divisor
Browse files Browse the repository at this point in the history
Previously constant folding of zero division (e.x. 1/0) produces a
compile error. This was incorrectly implemented by checking if the
division result is infinite, so produces wrong results compared to the
query where no constant folding is processed (e.x. 1e308/0.1). This
patch delays the operation when the divisor is zero. This makes the
results more consistent, but changes the exit code on zero division from
3 to 5. Also 0/0 now produces the zero division error, not NaN.

This patch also fixes the modulo operation. Previously constant folding
logic does not take care of the % operator, but now it folds if the both
dividend and divisor are safe numbers to cast to the integer type, and
the divisor is not zero. This patch also fixes some code that relies on
undefined cast behaviors in C. The modulo operation produces NaN if
either the dividend or divisor is NaN.
  • Loading branch information
itchyny committed Jul 31, 2023
1 parent c8e28da commit 00a04b2
Show file tree
Hide file tree
Showing 7 changed files with 476 additions and 437 deletions.
15 changes: 12 additions & 3 deletions src/builtin.c
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ static jv f_multiply(jq_state *jq, jv input, jv a, jv b) {
static jv f_divide(jq_state *jq, jv input, jv a, jv b) {
jv_free(input);
if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
if (jv_number_value(b) == 0.0 && jv_number_value(a) != 0.0)
if (jv_number_value(b) == 0.0)
return type_error2(a, b, "cannot be divided because the divisor is zero");
jv r = jv_number(jv_number_value(a) / jv_number_value(b));
jv_free(a);
Expand All @@ -396,21 +396,30 @@ static jv f_divide(jq_state *jq, jv input, jv a, jv b) {
}
}

#define dtoi(n) ((n) < INTMAX_MIN ? INTMAX_MIN : -(n) < INTMAX_MIN ? INTMAX_MAX : (intmax_t)(n))
static jv f_mod(jq_state *jq, jv input, jv a, jv b) {
jv_free(input);
if (jv_get_kind(a) == JV_KIND_NUMBER && jv_get_kind(b) == JV_KIND_NUMBER) {
intmax_t bi = (intmax_t)jv_number_value(b);
double na = jv_number_value(a);
double nb = jv_number_value(b);
if (isnan(na) || isnan(nb)) {
jv_free(a);
jv_free(b);
return jv_number(NAN);
}
intmax_t bi = dtoi(nb);
if (bi == 0)
return type_error2(a, b, "cannot be divided (remainder) because the divisor is zero");
// Check if the divisor is -1 to avoid overflow when the dividend is INTMAX_MIN.
jv r = jv_number(bi == -1 ? 0 : (intmax_t)jv_number_value(a) % bi);
jv r = jv_number(bi == -1 ? 0 : dtoi(na) % bi);
jv_free(a);
jv_free(b);
return r;
} else {
return type_error2(a, b, "cannot be divided (remainder)");
}
}
#undef dtoi

static jv f_equal(jq_state *jq, jv input, jv a, jv b) {
jv_free(input);
Expand Down
6 changes: 0 additions & 6 deletions src/compile.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,6 @@ int block_is_const(block b) {
return (block_is_single(b) && (b.first->op == LOADK || b.first->op == PUSHK_UNDER));
}

int block_is_const_inf(block b) {
return (block_is_single(b) && b.first->op == LOADK &&
jv_get_kind(b.first->imm.constant) == JV_KIND_NUMBER &&
isinf(jv_number_value(b.first->imm.constant)));
}

jv_kind block_const_kind(block b) {
assert(block_is_const(b));
return jv_get_kind(b.first->imm.constant);
Expand Down
1 change: 0 additions & 1 deletion src/compile.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ block gen_op_simple(opcode op);
block gen_const(jv constant);
block gen_const_global(jv constant, const char *name);
int block_is_const(block b);
int block_is_const_inf(block b);
jv_kind block_const_kind(block b);
jv block_const(block b);
block gen_op_target(opcode op, block target);
Expand Down
Loading

0 comments on commit 00a04b2

Please sign in to comment.