Merge branch 'PHP-5.5' into PHP-5.6

keyurdg · keyurdg · commit 83e55478279f · 2014-12-26T20:37:50.000Z
* PHP-5.5:
  Fix for failing tests. gcc 4.8.3 would optimize away the assigment.
diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c
@@ -195,7 +195,8 @@ ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l
 #ifdef HAVE_DECIMAL_FP_SUPPORT
 	{
 		typedef float dec32 __attribute__((mode(SD)));
-		dec32 d32val = fval;
+		/* volatile so the compiler will not optimize away the conversion */
+		volatile dec32 d32val = fval;
 
 		/* The following cast is guaranteed to do the right thing */
 		dval = (double) d32val;

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,8 @@ ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l`
`195`	`195`	`#ifdef HAVE_DECIMAL_FP_SUPPORT`
`196`	`196`	`{`
`197`	`197`	`typedef float dec32 __attribute__((mode(SD)));`
`198`		`- dec32 d32val = fval;`
	`198`	`+ /* volatile so the compiler will not optimize away the conversion */`
	`199`	`+ volatile dec32 d32val = fval;`
`199`	`200`
`200`	`201`	`/* The following cast is guaranteed to do the right thing */`
`201`	`202`	`dval = (double) d32val;`