Skip to content

Commit 74c02d4

Browse files
committed
Fix wrong const optimization for "1.0 / 0.0" case
In cpython, "1.0 / 0.0" raises ZeroDivisionError ``` >>> 1.0 / 0.0 Traceback (most recent call last): File "<stdin>", line 1, in <module> ZeroDivisionError: float division by zer ``` but RustPython doesn't ``` >>>>> 1.0 / 0.0 inf ``` This is because they emits different byte codes. ``` $ echo "1.0 / 0.0" > zero-div.py $ python -m dis zero-div.py 1 0 LOAD_CONST 0 (1.0) 2 LOAD_CONST 1 (0.0) 4 BINARY_TRUE_DIVIDE 6 POP_TOP 8 LOAD_CONST 2 (None) 10 RETURN_VALUE $ cargo run --example dis zero-div.py zero-div.py: 0 LoadConst (inf) 1 Pop 2 LoadConst (None) 3 ReturnValue ``` This commit stops optimization for zero division case to generate same byte codes.
1 parent e4bded8 commit 74c02d4

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

compiler/src/peephole/optimizations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ pub fn operator(buf: &mut impl OptimizationBuffer) {
5252
(op!(Multiply), lc!(Float, lhs), lc!(Float, rhs)) => {
5353
emitconst!(buf, [lhs_meta, rhs_meta], Float, lhs * rhs)
5454
}
55-
(op!(Divide), lc!(Float, lhs), lc!(Float, rhs)) => {
55+
(op!(Divide), lc!(Float, lhs), lc!(Float, rhs)) if rhs != 0.0 => {
5656
emitconst!(buf, [lhs_meta, rhs_meta], Float, lhs / rhs)
5757
}
5858
(op!(Power), lc!(Float, lhs), lc!(Float, rhs)) => {

tests/snippets/floats.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@
144144
assert_raises(ZeroDivisionError, lambda: 2 // 0.0)
145145
assert_raises(ZeroDivisionError, lambda: 2 % 0.0)
146146
# assert_raises(ZeroDivisionError, divmod, 2, 0.0)
147+
assert_raises(ZeroDivisionError, lambda: 2.0 / 0.0)
148+
assert_raises(ZeroDivisionError, lambda: 2.0 // 0.0)
149+
assert_raises(ZeroDivisionError, lambda: 2.0 % 0.0)
150+
assert_raises(ZeroDivisionError, divmod, 2.0, 0.0)
147151

148152
assert 1.2.__int__() == 1
149153
assert 1.2.__float__() == 1.2

0 commit comments

Comments
 (0)