Commit 1c1c0691cc4d47a39f382aec29654ae94cdf524c | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-02-14 23:12:51-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-02-14 23:12:51-05:00
log	1c1c0691cc4d47a39f382aec29654ae94cdf524c
tree	cb2761f1a5c56218665aa097a97f41ebca8aa0fe
parent	ca597e2bfb3c39aecdf3dea2718e84deb749ed07

closes #776

2 files changed, 14 insertions(+), 4 deletions(-)

src/ir.cpp+6-3

 @@ -9975,15 +9975,18 @@ static TypeTableEntry *ir_analyze_bin_op_math(IrAnalyze *ira, IrInstructionBinOp
                         ok = bigint_cmp(&rem_result, &mod_result) == CmpEQ;
                     }
                 } else {
-                    if (float_cmp_zero(&op2->value) == CmpEQ) {
+                    IrInstruction *casted_op2 = ir_implicit_cast(ira, op2, resolved_type);
+                    if (casted_op2 == ira->codegen->invalid_instruction)
+                        return ira->codegen->builtin_types.entry_invalid;
+                    if (float_cmp_zero(&casted_op2->value) == CmpEQ) {
                         // the division by zero error will be caught later, but we don't
                         // have a remainder function ambiguity problem
                         ok = true;
                     } else {
                         ConstExprValue rem_result;
                         ConstExprValue mod_result;
-                        float_rem(&rem_result, &op1->value, &op2->value);
+                        float_rem(&rem_result, &op1->value, &casted_op2->value);
-                        float_mod(&mod_result, &op1->value, &op2->value);
+                        float_mod(&mod_result, &op1->value, &casted_op2->value);
                         ok = float_cmp(&rem_result, &mod_result) == CmpEQ;
                     }
                 }

test/cases/math.zig+8-1