archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
This reverts commit 02690fe3c0.
This commit is contained in:
Dmitry Stogov 2023-04-04 09:58:56 +03:00
parent 3528ca8930
commit ac3abe4579
4 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_alloc.h
View file

@ -21,12 +21,12 @@
#ifndef ZEND_ALLOC_H
#define ZEND_ALLOC_H
#include "zend_portability.h"
#include "zend_result.h"
#include <stdio.h>
#include "../TSRM/TSRM.h"
#include "zend.h"
#ifndef ZEND_MM_ALIGNMENT
# error "ZEND_MM_ALIGNMENT was not defined during configure"

1
Zend/zend_string.c
View file

@ -16,7 +16,6 @@
+----------------------------------------------------------------------+
*/
#include "zend_string.h"
#include "zend.h"
#include "zend_globals.h"
#include "zend_rc_debug.h"

20
Zend/zend_string.h
View file

@ -19,26 +19,8 @@
#ifndef ZEND_STRING_H
#define ZEND_STRING_H
#include "zend_alloc.h"
#include "zend.h"
#include "zend_char.h"
#include "zend_portability.h"
#include "zend_refcounted.h"
/* string flags (zval.value->gc.u.flags) */
#define IS_STR_CLASS_NAME_MAP_PTR GC_PROTECTED /* refcount is a map_ptr offset of class_entry */
#define IS_STR_INTERNED GC_IMMUTABLE /* interned string */
#define IS_STR_PERSISTENT GC_PERSISTENT /* allocated using malloc */
#define IS_STR_PERMANENT (1<<8) /* relives request boundary */
#define IS_STR_VALID_UTF8 (1<<9) /* valid UTF-8 according to PCRE */
typedef struct _zend_string zend_string;
struct _zend_string {
zend_refcounted_h gc;
zend_ulong h; /* hash value */
size_t len;
char val[1];
};
BEGIN_EXTERN_C()

14
Zend/zend_types.h
View file

@ -331,6 +331,13 @@ struct _zval_struct {
} u2;
};
struct _zend_string {
zend_refcounted_h gc;
zend_ulong h; /* hash value */
size_t len;
char val[1];
};
typedef struct _Bucket {
zval val;
zend_ulong h; /* hash value (or numeric index) */
@ -620,6 +627,13 @@ static zend_always_inline uint8_t zval_get_type(const zval* pz) {
#define IS_CONSTANT_AST_EX (IS_CONSTANT_AST | (IS_TYPE_REFCOUNTED << Z_TYPE_FLAGS_SHIFT))
/* string flags (zval.value->gc.u.flags) */
#define IS_STR_CLASS_NAME_MAP_PTR GC_PROTECTED /* refcount is a map_ptr offset of class_entry */
#define IS_STR_INTERNED GC_IMMUTABLE /* interned string */
#define IS_STR_PERSISTENT GC_PERSISTENT /* allocated using malloc */
#define IS_STR_PERMANENT (1<<8) /* relives request boundary */
#define IS_STR_VALID_UTF8 (1<<9) /* valid UTF-8 according to PCRE */
/* array flags */
#define IS_ARRAY_IMMUTABLE GC_IMMUTABLE
#define IS_ARRAY_PERSISTENT GC_PERSISTENT