]> granicus.if.org Git - php/commitdiff
Drop duplicate dtors in update_opN
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 4 Jul 2017 19:23:34 +0000 (21:23 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 4 Jul 2017 19:23:34 +0000 (21:23 +0200)
Per new convention update_opN should no longer dtor on failure.

ext/opcache/Optimizer/zend_optimizer.c

index 2179cf267c00f7ca2d057cdfa45724c1e1f9d8c5..99f1cf6a981c01dbae7b22def108eb28ad1141f5 100644 (file)
@@ -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); \