com php-src: Add ZEND_TRY_ASSIGN_BOOL API: Zend/zen d_API.h

From: Date: Fri, 08 Feb 2019 11:30:54 +0000
Subject: com php-src: Add ZEND_TRY_ASSIGN_BOOL API: Zend/zen d_API.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-104482@lists.php.net to get a copy of this message
Commit: a9d4caeecea947e7ee5425661204045c0bbba66f Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 8 Feb 2019 11:06:50 +0100 Parents: 7a6fa7f6247d13d4d464a948451866b554721f81 Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a9d4caeecea947e7ee5425661204045c0bbba66f Log: Add ZEND_TRY_ASSIGN_BOOL API Cherry-picked from master, this is of course also necessary in 7.4.... Changed paths: M Zend/zend_API.h Diff: diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 7d9aad4..21ba965 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -716,6 +716,20 @@ ZEND_API int zend_try_assign_typed_ref_zval_ex(zend_reference *ref, zval *zv, ze ZVAL_TRUE(_zv); \ } while (0) +#define ZEND_TRY_ASSIGN_BOOL(zv, bval) do { \ + zval *_zv = zv; \ + if (EXPECTED(Z_ISREF_P(_zv))) { \ + zend_reference *ref = Z_REF_P(_zv); \ + if (UNEXPECTED(ZEND_REF_HAS_TYPE_SOURCES(ref))) { \ + zend_try_assign_typed_ref_bool(ref, 1); \ + break; \ + } \ + _zv = &ref->val; \ + } \ + zval_ptr_dtor(_zv); \ + ZVAL_BOOL(_zv, bval); \ +} while (0) + #define ZEND_TRY_ASSIGN_LONG(zv, lval) do { \ zval *_zv = zv; \ if (EXPECTED(Z_ISREF_P(_zv))) { \

« previous php.cvs (#104482) next »