Revert "Zend/zend_types.h: move zend_rc_debug to zend_rc_debug.h"

This reverts commit d6e9504.

Author: dstogov

Zend/zend.c

@@ -95,6 +95,10 @@ void (*zend_on_timeout)(int seconds);
 static void (*zend_message_dispatcher_p)(zend_long message, const void *data);
 static zval *(*zend_get_configuration_directive_p)(zend_string *name);
 
+#if ZEND_RC_DEBUG
+ZEND_API bool zend_rc_debug = 0;
+#endif
+
 static ZEND_INI_MH(OnUpdateErrorReporting) /* {{{ */
 {
 	if (!new_value) {

Zend/zend_API.c

@@ -32,7 +32,6 @@
 #include "zend_ini.h"
 #include "zend_enum.h"
 #include "zend_observer.h"
-#include "zend_rc_debug.h"
 
 #include <stdarg.h>
 

Zend/zend_rc_debug.c

@@ -18,7 +18,6 @@
 
 #include "zend.h"
 #include "zend_globals.h"
-#include "zend_rc_debug.h"
 
 #ifdef HAVE_VALGRIND
 # include "valgrind/callgrind.h"

Zend/zend_rc_debug.h

@@ -24,7 +24,6 @@
 
 #include "zend_portability.h"
 #include "zend_long.h"
-#include "zend_rc_debug.h"
 #include "zend_result.h"
 
 #include <stdbool.h>
@@ -1162,11 +1161,29 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
 #define Z_TRY_ADDREF(z)				Z_TRY_ADDREF_P(&(z))
 #define Z_TRY_DELREF(z)				Z_TRY_DELREF_P(&(z))
 
+#ifndef ZEND_RC_DEBUG
+# define ZEND_RC_DEBUG 0
+#endif
+
 #if ZEND_RC_DEBUG
+extern ZEND_API bool zend_rc_debug;
+/* The GC_PERSISTENT flag is reused for IS_OBJ_WEAKLY_REFERENCED on objects.
+ * Skip checks for OBJECT/NULL type to avoid interpreting the flag incorrectly. */
+# define ZEND_RC_MOD_CHECK(p) do { \
+		if (zend_rc_debug) { \
+			uint8_t type = zval_gc_type((p)->u.type_info); \
+			if (type != IS_OBJECT && type != IS_NULL) { \
+				ZEND_ASSERT(!(zval_gc_flags((p)->u.type_info) & GC_IMMUTABLE)); \
+				ZEND_ASSERT((zval_gc_flags((p)->u.type_info) & (GC_PERSISTENT|GC_PERSISTENT_LOCAL)) != GC_PERSISTENT); \
+			} \
+		} \
+	} while (0)
 # define GC_MAKE_PERSISTENT_LOCAL(p) do { \
 		GC_ADD_FLAGS(p, GC_PERSISTENT_LOCAL); \
 	} while (0)
 #else
+# define ZEND_RC_MOD_CHECK(p) \
+	do { } while (0)
 # define GC_MAKE_PERSISTENT_LOCAL(p) \
 	do { } while (0)
 #endif

Zend/zend_string.c

@@ -1723,7 +1723,7 @@ PHP_ADD_SOURCES(Zend, \
     zend_virtual_cwd.c zend_ast.c zend_objects.c zend_object_handlers.c zend_objects_API.c \
     zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c zend_gdb.c \
     zend_observer.c zend_system_id.c zend_enum.c zend_fibers.c zend_atomic.c \
-    zend_rc_debug.c zend_max_execution_timer.c \
+    zend_max_execution_timer.c \
 	Optimizer/zend_optimizer.c \
 	Optimizer/pass1.c \
 	Optimizer/pass3.c \

Zend/zend_types.h

@@ -71,7 +71,6 @@
 #include "zend_ini.h"
 #include "zend_dtrace.h"
 #include "zend_observer.h"
-#include "zend_rc_debug.h"
 #include "zend_system_id.h"
 
 #include "php_content_types.h"

configure.ac

@@ -29,7 +29,6 @@
 
 #include "php_version.h"
 #include "zend.h"
-#include "zend_rc_debug.h"
 #include "zend_sort.h"
 #include "php_compat.h"
 

main/main.c

@@ -22,7 +22,6 @@
 #include "ext/standard/dl.h"
 #include "zend_extensions.h"
 #include "zend_highlight.h"
-#include "zend_rc_debug.h"
 #include "SAPI.h"
 #include "php_main.h"
 #include "php_scandir.h"

main/php.h

@@ -27,7 +27,6 @@
 #include "php.h"
 #include "zend_ini_scanner.h"
 #include "zend_globals.h"
-#include "zend_rc_debug.h"
 #include "zend_stream.h"
 
 #include "SAPI.h"