From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 18 Mar 2019 09:04:29 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.4RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61eebb559e6c473aaee91a545c14134969752783;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

61eebb559e6c473aaee91a545c14134969752783
diff --cc Zend/zend_objects_API.c
index 3389b64608,3e3c8a8005..c5ac9708e5
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@@ -39,8 -41,9 +39,9 @@@ ZEND_API void ZEND_FASTCALL zend_object
  	objects->object_buckets = NULL;
  }
  
 -ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects)
 +ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors(zend_objects_store *objects)
  {
+ 	EG(flags) |= EG_FLAGS_OBJECT_STORE_NO_REUSE;
  	if (objects->top > 1) {
  		uint32_t i;
  		for (i = 1; i < objects->top; i++) {