From: Bob Weinand <bobwei9@hotmail.com>
Date: Thu, 2 Jul 2015 00:04:16 +0000 (+0200)
Subject: CT eval ZEND_DIV in all cases (warning was removed)
X-Git-Tag: php-7.1.0alpha3~25^2~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06fcf94c452eca1260a4ae5d391ffdd47ee6478c;p=php

CT eval ZEND_DIV in all cases (warning was removed)
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 364f84e0c4..df19f93be2 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -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;
 	}