]> granicus.if.org Git - php/commitdiff
CT eval ZEND_DIV in all cases (warning was removed)
authorBob Weinand <bobwei9@hotmail.com>
Thu, 2 Jul 2015 00:04:16 +0000 (02:04 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Thu, 2 Jul 2015 00:20:58 +0000 (02:20 +0200)
Zend/zend_compile.c

index 364f84e0c4a06155939fd78e299f38a861ee5f5c..df19f93be2602555aa51889a0928308a49cfa32c 100644 (file)
@@ -5625,11 +5625,9 @@ static inline zend_bool zend_try_ct_eval_binary_op(zval *result, uint32_t opcode
        binary_op_type fn = get_binary_op(opcode);
 
        /* don't evaluate division by zero at compile-time */
-       if ((opcode == ZEND_DIV || opcode == ZEND_MOD) &&
-           zval_get_long(op2) == 0) {
+       if (opcode == ZEND_MOD && zval_get_long(op2) == 0) {
                return 0;
-       } else if ((opcode == ZEND_SL || opcode == ZEND_SR) &&
-           zval_get_long(op2) < 0) {
+       } else if ((opcode == ZEND_SL || opcode == ZEND_SR) && zval_get_long(op2) < 0) {
                return 0;
        }