com php-src: permanently deactivate that place, not on runtime only: Zend/zend_operators.h

From: Date: Wed, 20 Nov 2013 09:09:11 +0000
Subject: com php-src: permanently deactivate that place, not on runtime only: Zend/zend_operators.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74005@lists.php.net to get a copy of this message
Commit: b902a25cc319e0e824104245e382376a48256803 Author: Anatol Belski <ab@php.net> Wed, 20 Nov 2013 10:09:11 +0100 Parents: 0d558afc057e5e939d6cab325b2ddf2c170f0103 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b902a25cc319e0e824104245e382376a48256803 Log: permanently deactivate that place, not on runtime only besides the two "if" checks, this fixes static analyze which is sometimes broken because of this Changed paths: M Zend/zend_operators.h Diff: diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 047b92e..700b578 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -736,6 +736,7 @@ static zend_always_inline int fast_mul_function(zval *result, zval *op1, zval *o static zend_always_inline int fast_div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) { +#if 0 if (EXPECTED(Z_TYPE_P(op1) == IS_LONG) && 0) { if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) { if (UNEXPECTED(Z_LVAL_P(op2) == 0)) { @@ -790,6 +791,7 @@ static zend_always_inline int fast_div_function(zval *result, zval *op1, zval *o return SUCCESS; } } +#endif return div_function(result, op1, op2 TSRMLS_CC); }

« previous php.cvs (#74005) next »