Merge branch 'PHP-7.1' into PHP-7.2

remicollet · remicollet · commit 6e703c957ebd · 2018-08-30T09:04:13.000+02:00
* PHP-7.1:
  fix double cast to int on 32-bit
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -3108,7 +3108,7 @@ ZEND_API zend_long ZEND_FASTCALL zend_dval_to_lval_slow(double d)
 	if (dmod < 0) {
 		/* we're going to make this number positive; call ceil()
 		 * to simulate rounding towards 0 of the negative number */
-		dmod = ceil(dmod);// + two_pow_32;
+		dmod = ceil(dmod) + two_pow_32;
 	}
 	return (zend_long)(zend_ulong)dmod;
 }

Original file line number	Diff line number	Diff line change
`@@ -3108,7 +3108,7 @@ ZEND_API zend_long ZEND_FASTCALL zend_dval_to_lval_slow(double d)`
`3108`	`3108`	`if (dmod < 0) {`
`3109`	`3109`	`/* we're going to make this number positive; call ceil()`
`3110`	`3110`	`* to simulate rounding towards 0 of the negative number */`
`3111`		`- dmod = ceil(dmod);// + two_pow_32;`
	`3111`	`+ dmod = ceil(dmod) + two_pow_32;`
`3112`	`3112`	`}`
`3113`	`3113`	`return (zend_long)(zend_ulong)dmod;`
`3114`	`3114`	`}`