mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 09:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename _zval_dtor_func to _ref_dtor_func

Browse Source
This commit is contained in:
Xinchen Hui 2018-07-06 18:32:27 +08:00
parent 9a21aa77af
commit a362ae6b12
11 changed files with 808 additions and 757 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend_execute.c
View File

@ -146,7 +146,7 @@ ZEND_API const zend_internal_function zend_pass_function = {
if (EXPECTED(Z_TYPE_P(__zv) == IS_INDIRECT)) { \
ZVAL_COPY(__zv, Z_INDIRECT_P(__zv)); \
} \
zval_dtor_func(__ref); \
ref_dtor_func(__ref); \
} \
} \
} while (0)
@ -604,7 +604,7 @@ static inline void zend_assign_to_variable_reference(zval *variable_ptr, zval *v
if (GC_DELREF(garbage) == 0) {
ZVAL_REF(variable_ptr, ref);
zval_dtor_func(garbage);
ref_dtor_func(garbage);
return;
} else {
gc_check_possible_root(garbage);
@ -2366,7 +2366,7 @@ static zend_always_inline void i_free_compiled_variables(zend_execute_data *exec
zend_refcounted *r = Z_COUNTED_P(cv);
if (!GC_DELREF(r)) {
ZVAL_NULL(cv);
zval_dtor_func(r);
ref_dtor_func(r);
} else {
gc_check_possible_root(r);
}

6
Zend/zend_execute.h
View File

@ -107,7 +107,7 @@ static zend_always_inline zval* zend_assign_to_variable(zval *variable_ptr, zval
Z_ADDREF_P(variable_ptr);
}
}
zval_dtor_func(garbage);
ref_dtor_func(garbage);
return variable_ptr;
} else { /* we need to split */
/* optimized version of GC_ZVAL_CHECK_POSSIBLE_ROOT(variable_ptr) */
@ -232,7 +232,7 @@ static zend_always_inline void zend_vm_stack_free_extra_args_ex(uint32_t call_in
zend_refcounted *r = Z_COUNTED_P(p);
if (!GC_DELREF(r)) {
ZVAL_NULL(p);
zval_dtor_func(r);
ref_dtor_func(r);
} else {
gc_check_possible_root(r);
}
@ -259,7 +259,7 @@ static zend_always_inline void zend_vm_stack_free_args(zend_execute_data *call)
zend_refcounted *r = Z_COUNTED_P(p);
if (!GC_DELREF(r)) {
ZVAL_NULL(p);
zval_dtor_func(r);
ref_dtor_func(r);
}
}
p++;

2
Zend/zend_gc.c
View File

@ -512,7 +512,7 @@ static zend_never_inline void ZEND_FASTCALL gc_possible_root_when_full(zend_refc
GC_ADDREF(ref);
gc_adjust_threshold(gc_collect_cycles());
if (UNEXPECTED(GC_DELREF(ref)) == 0) {
zval_dtor_func(ref);
ref_dtor_func(ref);
return;
} else if (UNEXPECTED(GC_INFO(ref))) {
return;

32
Zend/zend_variables.c
View File

@ -44,27 +44,27 @@ static void ZEND_FASTCALL zend_ast_ref_destroy_wrapper(zend_ast_ref *ast ZEND_FI
# define zend_ast_ref_destroy_wrapper zend_ast_ref_destroy
#endif
typedef void (ZEND_FASTCALL *zend_zval_dtor_func_t)(zend_refcounted *p ZEND_FILE_LINE_DC);
typedef void (ZEND_FASTCALL *zend_ref_dtor_func_t)(zend_refcounted *p ZEND_FILE_LINE_DC);
static const zend_zval_dtor_func_t zend_zval_dtor_func[] = {
/* IS_UNDEF */ (zend_zval_dtor_func_t)zend_empty_destroy,
/* IS_NULL */ (zend_zval_dtor_func_t)zend_empty_destroy,
/* IS_FALSE */ (zend_zval_dtor_func_t)zend_empty_destroy,
/* IS_TRUE */ (zend_zval_dtor_func_t)zend_empty_destroy,
/* IS_LONG */ (zend_zval_dtor_func_t)zend_empty_destroy,
/* IS_DOUBLE */ (zend_zval_dtor_func_t)zend_empty_destroy,
/* IS_STRING */ (zend_zval_dtor_func_t)zend_string_destroy,
/* IS_ARRAY */ (zend_zval_dtor_func_t)zend_array_destroy_wrapper,
/* IS_OBJECT */ (zend_zval_dtor_func_t)zend_object_destroy_wrapper,
/* IS_RESOURCE */ (zend_zval_dtor_func_t)zend_resource_destroy_wrapper,
/* IS_REFERENCE */ (zend_zval_dtor_func_t)zend_reference_destroy,
/* IS_CONSTANT_AST */ (zend_zval_dtor_func_t)zend_ast_ref_destroy_wrapper
static const zend_ref_dtor_func_t zend_ref_dtor_func[] = {
/* IS_UNDEF */ (zend_ref_dtor_func_t)zend_empty_destroy,
/* IS_NULL */ (zend_ref_dtor_func_t)zend_empty_destroy,
/* IS_FALSE */ (zend_ref_dtor_func_t)zend_empty_destroy,
/* IS_TRUE */ (zend_ref_dtor_func_t)zend_empty_destroy,
/* IS_LONG */ (zend_ref_dtor_func_t)zend_empty_destroy,
/* IS_DOUBLE */ (zend_ref_dtor_func_t)zend_empty_destroy,
/* IS_STRING */ (zend_ref_dtor_func_t)zend_string_destroy,
/* IS_ARRAY */ (zend_ref_dtor_func_t)zend_array_destroy_wrapper,
/* IS_OBJECT */ (zend_ref_dtor_func_t)zend_object_destroy_wrapper,
/* IS_RESOURCE */ (zend_ref_dtor_func_t)zend_resource_destroy_wrapper,
/* IS_REFERENCE */ (zend_ref_dtor_func_t)zend_reference_destroy,
/* IS_CONSTANT_AST */ (zend_ref_dtor_func_t)zend_ast_ref_destroy_wrapper
};
ZEND_API void ZEND_FASTCALL _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC)
ZEND_API void ZEND_FASTCALL _ref_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC)
{
ZEND_ASSERT(GC_TYPE(p) <= IS_CONSTANT_AST);
zend_zval_dtor_func[GC_TYPE(p)](p ZEND_FILE_LINE_RELAY_CC);
zend_ref_dtor_func[GC_TYPE(p)](p ZEND_FILE_LINE_RELAY_CC);
}
static void ZEND_FASTCALL zend_string_destroy(zend_string *str ZEND_FILE_LINE_DC)

9
Zend/zend_variables.h
View File

@ -28,16 +28,16 @@
BEGIN_EXTERN_C()
ZEND_API void ZEND_FASTCALL _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC);
ZEND_API void ZEND_FASTCALL _ref_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC);
ZEND_API void ZEND_FASTCALL _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC);
#define zval_dtor_func(zv) _zval_dtor_func(zv ZEND_FILE_LINE_CC)
#define ref_dtor_func(ref) _ref_dtor_func(ref ZEND_FILE_LINE_CC)
#define zval_copy_ctor_func(zv) _zval_copy_ctor_func(zv ZEND_FILE_LINE_CC)
static zend_always_inline void _zval_ptr_dtor_nogc(zval *zval_ptr ZEND_FILE_LINE_DC)
{
if (Z_REFCOUNTED_P(zval_ptr) && !Z_DELREF_P(zval_ptr)) {
_zval_dtor_func(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC);
_ref_dtor_func(Z_COUNTED_P(zval_ptr) ZEND_FILE_LINE_RELAY_CC);
}
}
@ -46,7 +46,7 @@ static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC)
if (Z_REFCOUNTED_P(zval_ptr)) {
zend_refcounted *ref = Z_COUNTED_P(zval_ptr);
if (!GC_DELREF(ref)) {
_zval_dtor_func(ref ZEND_FILE_LINE_RELAY_CC);
_ref_dtor_func(ref ZEND_FILE_LINE_RELAY_CC);
} else {
gc_check_possible_root(ref);
}
@ -92,6 +92,7 @@ ZEND_API void _zval_internal_ptr_dtor(zval *zvalue ZEND_FILE_LINE_DC);
/* Kept for compatibility */
#define zval_dtor(zvalue) zval_ptr_dtor_nogc(zvalue)
#define zval_internal_dtor(zvalue) _zval_internal_ptr_dtor((zvalue) ZEND_FILE_LINE_CC)
#define zval_dtor_func _ref_dtor_func
#if ZEND_DEBUG
ZEND_API void _zval_ptr_dtor_wrapper(zval *zval_ptr);

6
Zend/zend_vm_def.h
View File

@ -3813,7 +3813,7 @@ ZEND_VM_HOT_HANDLER(62, ZEND_RETURN, CONST|TMP|VAR|CV, ANY)
if (OP1_TYPE & (IS_VAR|IS_TMP_VAR)) {
if (Z_REFCOUNTED_P(free_op1) && !Z_DELREF_P(free_op1)) {
SAVE_OPLINE();
zval_dtor_func(Z_COUNTED_P(free_op1));
ref_dtor_func(Z_COUNTED_P(free_op1));
}
}
} else {
@ -5441,7 +5441,7 @@ ZEND_VM_HANDLER(196, ZEND_UNSET_CV, CV, UNUSED)
ZVAL_UNDEF(var);
SAVE_OPLINE();
if (!GC_DELREF(garbage)) {
zval_dtor_func(garbage);
ref_dtor_func(garbage);
} else {
gc_check_possible_root(garbage);
}
@ -7489,7 +7489,7 @@ ZEND_VM_C_LABEL(check_indirect):
if (EXPECTED(variable_ptr != value)) {
if (refcnt == 0) {
SAVE_OPLINE();
zval_dtor_func(ref);
ref_dtor_func(ref);
if (UNEXPECTED(EG(exception))) {
ZVAL_NULL(variable_ptr);
HANDLE_EXCEPTION();

20
Zend/zend_vm_execute.h
View File

@ -2773,7 +2773,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RETURN_SPEC_CONST_
if (IS_CONST & (IS_VAR|IS_TMP_VAR)) {
if (Z_REFCOUNTED_P(free_op1) && !Z_DELREF_P(free_op1)) {
SAVE_OPLINE();
zval_dtor_func(Z_COUNTED_P(free_op1));
ref_dtor_func(Z_COUNTED_P(free_op1));
}
}
} else {
@ -17780,7 +17780,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RETURN_SPEC_TMP_HA
if (IS_TMP_VAR & (IS_VAR|IS_TMP_VAR)) {
if (Z_REFCOUNTED_P(free_op1) && !Z_DELREF_P(free_op1)) {
SAVE_OPLINE();
zval_dtor_func(Z_COUNTED_P(free_op1));
ref_dtor_func(Z_COUNTED_P(free_op1));
}
}
} else {
@ -20592,7 +20592,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RETURN_SPEC_VAR_HA
if (IS_VAR & (IS_VAR|IS_TMP_VAR)) {
if (Z_REFCOUNTED_P(free_op1) && !Z_DELREF_P(free_op1)) {
SAVE_OPLINE();
zval_dtor_func(Z_COUNTED_P(free_op1));
ref_dtor_func(Z_COUNTED_P(free_op1));
}
}
} else {
@ -36744,7 +36744,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RETURN_SPEC_CV_HAN
if (IS_CV & (IS_VAR|IS_TMP_VAR)) {
if (Z_REFCOUNTED_P(free_op1) && !Z_DELREF_P(free_op1)) {
SAVE_OPLINE();
zval_dtor_func(Z_COUNTED_P(free_op1));
ref_dtor_func(Z_COUNTED_P(free_op1));
}
}
} else {
@ -41623,7 +41623,7 @@ check_indirect:
if (EXPECTED(variable_ptr != value)) {
if (refcnt == 0) {
SAVE_OPLINE();
zval_dtor_func(ref);
ref_dtor_func(ref);
if (UNEXPECTED(EG(exception))) {
ZVAL_NULL(variable_ptr);
HANDLE_EXCEPTION();
@ -46762,7 +46762,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_CV_SPEC_CV_UNUSED_HANDLE
ZVAL_UNDEF(var);
SAVE_OPLINE();
if (!GC_DELREF(garbage)) {
zval_dtor_func(garbage);
ref_dtor_func(garbage);
} else {
gc_check_possible_root(garbage);
}
@ -55095,7 +55095,7 @@ zend_leave_helper_SPEC_LABEL:
if (IS_CONST & (IS_VAR|IS_TMP_VAR)) {
if (Z_REFCOUNTED_P(free_op1) && !Z_DELREF_P(free_op1)) {
SAVE_OPLINE();
zval_dtor_func(Z_COUNTED_P(free_op1));
ref_dtor_func(Z_COUNTED_P(free_op1));
}
}
} else {
@ -56761,7 +56761,7 @@ zend_leave_helper_SPEC_LABEL:
if (IS_TMP_VAR & (IS_VAR|IS_TMP_VAR)) {
if (Z_REFCOUNTED_P(free_op1) && !Z_DELREF_P(free_op1)) {
SAVE_OPLINE();
zval_dtor_func(Z_COUNTED_P(free_op1));
ref_dtor_func(Z_COUNTED_P(free_op1));
}
}
} else {
@ -57051,7 +57051,7 @@ zend_leave_helper_SPEC_LABEL:
if (IS_VAR & (IS_VAR|IS_TMP_VAR)) {
if (Z_REFCOUNTED_P(free_op1) && !Z_DELREF_P(free_op1)) {
SAVE_OPLINE();
zval_dtor_func(Z_COUNTED_P(free_op1));
ref_dtor_func(Z_COUNTED_P(free_op1));
}
}
} else {
@ -58697,7 +58697,7 @@ zend_leave_helper_SPEC_LABEL:
if (IS_CV & (IS_VAR|IS_TMP_VAR)) {
if (Z_REFCOUNTED_P(free_op1) && !Z_DELREF_P(free_op1)) {
SAVE_OPLINE();
zval_dtor_func(Z_COUNTED_P(free_op1));
ref_dtor_func(Z_COUNTED_P(free_op1));
}
}
} else {

1415
ext/json/json_parser.tab.c
View File

File diff suppressed because it is too large Load Diff

65
ext/json/json_parser.tab.h
View File

@ -1,19 +1,21 @@
/* A Bison parser, made by GNU Bison 3.0.4. */
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton interface for Bison's Yacc-like parsers in C
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
@ -26,35 +28,27 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
#ifndef YY_PHP_JSON_YY_HOME_DMITRY_PHP_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED
# define YY_PHP_JSON_YY_HOME_DMITRY_PHP_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED
/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
#endif
#if YYDEBUG
extern int php_json_yydebug;
#endif
/* Token type. */
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
enum yytokentype
{
PHP_JSON_T_NUL = 258,
PHP_JSON_T_TRUE = 259,
PHP_JSON_T_FALSE = 260,
PHP_JSON_T_INT = 261,
PHP_JSON_T_DOUBLE = 262,
PHP_JSON_T_STRING = 263,
PHP_JSON_T_ESTRING = 264,
PHP_JSON_T_EOI = 265,
PHP_JSON_T_ERROR = 266
};
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
PHP_JSON_T_NUL = 258,
PHP_JSON_T_TRUE = 259,
PHP_JSON_T_FALSE = 260,
PHP_JSON_T_INT = 261,
PHP_JSON_T_DOUBLE = 262,
PHP_JSON_T_STRING = 263,
PHP_JSON_T_ESTRING = 264,
PHP_JSON_T_EOI = 265,
PHP_JSON_T_ERROR = 266
};
#endif
/* Tokens. */
#define PHP_JSON_T_NUL 258
@ -67,10 +61,11 @@ extern int php_json_yydebug;
#define PHP_JSON_T_EOI 265
#define PHP_JSON_T_ERROR 266
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
union YYSTYPE
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
@ -81,15 +76,13 @@ union YYSTYPE
} pair;
};
typedef union YYSTYPE YYSTYPE;
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
#endif
int php_json_yyparse (php_json_parser *parser);
#endif /* !YY_PHP_JSON_YY_HOME_DMITRY_PHP_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED */

2
ext/soap/php_packet_soap.c
View File

@ -385,7 +385,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction
} else {
zend_refcounted *garbage = Z_COUNTED_P(return_value);
ZVAL_COPY(return_value, tmp);
zval_dtor_func(garbage);
ref_dtor_func(garbage);
}
}
}

2
ext/standard/var_unserializer.c
View File

@ -1,4 +1,4 @@
/* Generated by re2c 1.0.1 */
/* Generated by re2c 0.16 */
#line 1 "ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+