com php-src: Fixed Bug #70173 (ZVAL_COPY_VALUE_EX bro ken for 32bit Solaris Sparc): NEWS Zend/zen d_types.h

Commit: 89940993f0f60415e539b05dbec2c24fa79bca81 Author: Xinchen Hui <laruence@php.net> Mon, 10 Aug 2015 22:58:58 +0800 Parents: 644bb2f654d6838197bd89034989e650238bcf23 Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=89940993f0f60415e539b05dbec2c24fa79bca81 Log: Fixed Bug #70173 (ZVAL_COPY_VALUE_EX broken for 32bit Solaris Sparc) Bugs: https://bugs.php.net/70173 Changed paths: M NEWS M Zend/zend_types.h Diff: diff --git a/NEWS b/NEWS index a29f54c..83de487 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ PHP NEWS . Fixed bug #70223 (Incrementing value returned by magic getter). (Laruence) . Fixed bug #70215 (Segfault when __invoke is static). (Bob) . Fixed bug #70207 (Finally is broken with opcache). (Laruence, Dmitry) + . Fixed bug #70173 (ZVAL_COPY_VALUE_EX broken for 32bit Solaris Sparc). + (Laruence, cmb) - CLI server: . Fixed bug #66606 (Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE). diff --git a/Zend/zend_types.h b/Zend/zend_types.h index 50a4698..edcbe47 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -112,9 +112,8 @@ typedef union _zend_value { zend_class_entry *ce; zend_function *func; struct { - ZEND_ENDIAN_LOHI( - uint32_t w1, - uint32_t w2) + uint32_t w1; + uint32_t w2; } ww; } zend_value; @@ -822,23 +821,13 @@ static zend_always_inline uint32_t zval_delref_p(zval* pz) { } #if SIZEOF_SIZE_T == 4 -# ifdef WORDS_BIGENDIAN -# define ZVAL_COPY_VALUE_EX(z, v, gc, t) \ - do { \ - uint32_t _w1 = v->value.ww.w1; \ - Z_COUNTED_P(z) = gc; \ - z->value.ww.w1 = _w1; \ - Z_TYPE_INFO_P(z) = t; \ - } while (0) -# else -# define ZVAL_COPY_VALUE_EX(z, v, gc, t) \ +# define ZVAL_COPY_VALUE_EX(z, v, gc, t) \ do { \ uint32_t _w2 = v->value.ww.w2; \ Z_COUNTED_P(z) = gc; \ z->value.ww.w2 = _w2; \ Z_TYPE_INFO_P(z) = t; \ } while (0) -# endif #elif SIZEOF_SIZE_T == 8 # define ZVAL_COPY_VALUE_EX(z, v, gc, t) \ do { \