com php-src: Drop duplicate dtors in update_opN: ext/opca che/Optimizer/zend_optimizer.c

From: Date: Tue, 04 Jul 2017 19:23:34 +0000
Subject: com php-src: Drop duplicate dtors in update_opN: ext/opca che/Optimizer/zend_optimizer.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98340@lists.php.net to get a copy of this message
Commit: 8e0ddc89febb6c652a453d16ff7c28313a4610f6 Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 4 Jul 2017 21:23:34 +0200 Parents: 3f8ceb6f05893e3371297ee63843cc4766956675 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8e0ddc89febb6c652a453d16ff7c28313a4610f6 Log: Drop duplicate dtors in update_opN Per new convention update_opN should no longer dtor on failure. Changed paths: M ext/opcache/Optimizer/zend_optimizer.c Diff: diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index 2179cf2..99f1cf6 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -222,14 +222,12 @@ static inline void alloc_cache_slots_op2(zend_op_array *op_array, zend_op *oplin #define REQUIRES_STRING(val) do { \ if (Z_TYPE_P(val) != IS_STRING) { \ - zval_ptr_dtor_nogc(val); \ return 0; \ } \ } while (0) #define TO_STRING_NOWARN(val) do { \ if (Z_TYPE_P(val) >= IS_ARRAY) { \ - zval_ptr_dtor_nogc(val); \ return 0; \ } \ convert_to_string(val); \

« previous php.cvs (#98340) next »