From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 4 Jul 2017 19:23:34 +0000 (+0200)
Subject: Drop duplicate dtors in update_opN
X-Git-Tag: php-7.2.0beta1~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e0ddc89febb6c652a453d16ff7c28313a4610f6;p=php

Drop duplicate dtors in update_opN

Per new convention update_opN should no longer dtor on failure.
---

diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index 2179cf267c..99f1cf6a98 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); \