php-src/Zend
Nikita Popov 7b7d99839c Fix symtable cache being used while cleaning symtable
We need to first clean the symtable and then check whether a cache
slot is available for it. Otherwise, it may happen that a destructor
runs while cleaning the table and uses up all the remaining slots
in the cache.

This is particularly insidious because once we overflow the cache,
the first pointer we modify is symtable_cache_ptr, making it hard
to understand what happened after the fact.

Fixes oss-fuzz #30815.
2021-02-15 14:58:38 +01:00
..
tests Fix symtable cache being used while cleaning symtable 2021-02-15 14:58:38 +01:00
bench.php Apply tidy formatting 2020-02-03 13:41:31 +01:00
LICENSE Trim trailing whitespace in source code files 2018-10-13 14:17:28 +02:00
Makefile.frag Fixed bug #78102 2019-06-05 10:04:57 +02:00
micro_bench.php Apply tidy formatting 2020-02-03 13:41:31 +01:00
README.md [ci skip] Join Zend engine docs-alike files to readme 2019-05-18 20:39:18 +02:00
zend_alloc_sizes.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_alloc.c Merge branch 'PHP-7.3' into PHP-7.4 2020-02-27 12:27:58 +03:00
zend_alloc.h fix cross compilation failure due to size_t typecast in define 2020-01-30 15:51:54 +01:00
zend_API.c Merge branch 'PHP-7.3' into PHP-7.4 2020-08-30 16:25:12 +08:00
zend_API.h Add ZEND_DEP_ME macro 2019-07-11 17:09:03 +02:00
zend_arena.h Add tracked arena allocator 2019-06-28 12:44:18 +02:00
zend_ast.c Apply tidy formatting 2020-02-03 13:41:31 +01:00
zend_ast.h Implement arrow functions 2019-05-02 15:04:03 +02:00
zend_bitset.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_build.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_builtin_functions.c Merge branch 'PHP-7.3' into PHP-7.4 2020-07-31 10:57:02 +02:00
zend_builtin_functions.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_closures.c Fix #74558: Can't rebind closure returned by Closure::fromCallable() 2020-11-16 14:31:06 +01:00
zend_closures.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_compile.c Fix dynamic function definition in preload script 2020-11-04 10:54:08 +01:00
zend_compile.h Allow loading FFI bindings through ffi.preload directive 2019-10-22 17:52:56 +03:00
zend_config.w32.h Remove legacy AC_CHECK_TYPE calls for uint and ulong 2019-03-06 22:49:16 +01:00
zend_constants.c Merge branch 'PHP-7.3' into PHP-7.4 2019-02-12 11:43:53 +01:00
zend_constants.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_cpuinfo.c Fix build for non-x86 2020-11-27 17:04:17 +01:00
zend_cpuinfo.h Disable RTLD_DEEPBIND under memory sanitizer 2019-07-01 09:37:34 +02:00
zend_default_classes.c zend_weakrefs 2019-03-12 00:35:35 +01:00
zend_dtrace.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_dtrace.d Take out some last remnants of the yearly copyright range 2019-01-30 11:48:30 +01:00
zend_dtrace.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_errors.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_exceptions.c Merge branch 'PHP-7.3' into PHP-7.4 2020-06-30 12:25:29 +02:00
zend_exceptions.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_execute_API.c IBM i PASE doesn't support ITIMER_PROF 2020-12-15 10:15:28 +01:00
zend_execute.c Fix symtable cache being used while cleaning symtable 2021-02-15 14:58:38 +01:00
zend_execute.h Export zend_init_func_run_time_cache() 2019-12-09 15:58:00 +03:00
zend_extensions.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_extensions.h Free two bits in fn_flags by merging ZEND_ACC_HEAP_RT_CACHE/ZEND_ACC_USER_ARG_INFO and ZEND_ACC_DONE_PASS_TWO/ZEND_ACC_ARENA_ALLOCATED that may be used only for user/internal functions 2019-09-02 14:05:28 +03:00
zend_float.c Revert "Fix #79595: zend_init_fpu() alters FPU precision" 2020-05-22 16:57:14 +02:00
zend_float.h Fix #79595: zend_init_fpu() alters FPU precision 2020-05-26 17:19:54 +02:00
zend_gc.c Handle reallocated root buffer during GC destroy phase (v2) 2019-11-23 10:45:20 -05:00
zend_gc.h Set expectation to reduce hot code fragmentation 2019-07-10 18:29:35 +03:00
zend_generators.c Short-circuit get_gc for currently running generator 2020-11-18 12:45:29 +01:00
zend_generators.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_globals_macros.h Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc. 2019-03-14 03:01:01 +03:00
zend_globals.h Introduce extra counter to avoid RTD key collisions 2019-12-13 11:04:44 +01:00
zend_hash.c Merge branch 'PHP-7.3' into PHP-7.4 2020-10-12 11:24:59 +02:00
zend_hash.h Add specialized pair construction API 2019-06-11 12:29:55 +02:00
zend_highlight.c Revert "Switch to bison location tracking" 2019-03-28 09:29:08 +01:00
zend_highlight.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_inheritance.c Fix bug #80126 2020-10-06 16:33:14 +02:00
zend_inheritance.h Allow throwing exception while loading parent class 2019-09-12 16:41:18 +02:00
zend_ini_parser.y Canonicalize bison error during ini parsing 2020-05-14 14:15:56 +02:00
zend_ini_scanner.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_ini_scanner.l Fixed bug #79244 (php crashes during parsing INI file). (Laruence) 2020-02-10 13:01:51 +08:00
zend_ini.c Merge branch 'PHP-7.3' into PHP-7.4 2020-08-21 15:28:37 +02:00
zend_ini.h Mark "cold" functions 2019-05-29 11:48:41 +03:00
zend_interfaces.c Support full variance if autoloading is used 2019-06-11 13:09:33 +02:00
zend_interfaces.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_istdiostream.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_iterators.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_iterators.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_language_parser.y Use "%define parse.error verbose" 2020-01-29 11:16:30 +01:00
zend_language_scanner.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_language_scanner.l Fix bug #80523 2020-12-16 10:20:20 +01:00
zend_list.c Fix stream leak in phar cache_list 2019-06-25 14:28:58 +02:00
zend_list.h Fix stream leak in phar cache_list 2019-06-25 14:28:58 +02:00
zend_llist.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_llist.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_long.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_map_ptr.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_modules.h Free two bits in fn_flags by merging ZEND_ACC_HEAP_RT_CACHE/ZEND_ACC_USER_ARG_INFO and ZEND_ACC_DONE_PASS_TWO/ZEND_ACC_ARENA_ALLOCATED that may be used only for user/internal functions 2019-09-02 14:05:28 +03:00
zend_multibyte.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_multibyte.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_multiply.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_object_handlers.c Fix assumption about property guard hash value 2020-09-15 15:26:41 +02:00
zend_object_handlers.h Fix typos in code comments in Zend/ [skip ci] 2019-02-18 17:56:28 +01:00
zend_objects_API.c Remove delref in free_object_storage 2019-08-28 17:04:36 +02:00
zend_objects_API.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_objects.c Fix bug #78226: Don't call __set() on uninitialized typed properties 2019-10-25 16:31:45 +02:00
zend_objects.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_opcode.c Fix live range calculation for FE_FETCH 2020-01-30 14:23:46 +01:00
zend_operators.c Merge branch 'PHP-7.3' into PHP-7.4 2020-10-12 11:24:59 +02:00
zend_operators.h Don't use asm arithmetic under msan 2020-02-21 11:58:52 +01:00
zend_portability.h Make MSVCRT memory leak checking usable for the test suite 2020-01-23 11:47:20 +01:00
zend_ptr_stack.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_ptr_stack.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_range_check.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_signal.c IBM i PASE doesn't support ITIMER_PROF 2020-12-15 10:15:28 +01:00
zend_signal.h Remove HAVE_SIGNAL_H 2019-04-07 15:55:34 +02:00
zend_smart_str_public.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_smart_str.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_smart_str.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_smart_string_public.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_smart_string.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_sort.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_sort.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_stack.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_stack.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_stream.c Fix #79514: Memory leaks while including unexistent file 2020-04-24 18:14:53 +02:00
zend_stream.h Revert "Drop free_filename field from zend_file_handle" 2019-07-24 10:43:37 +02:00
zend_string.c Merge branch 'PHP-7.3' into PHP-7.4 2019-04-18 14:27:05 +03:00
zend_string.h Merge branch 'PHP-7.3' into PHP-7.4 2020-09-03 09:51:35 +02:00
zend_strtod_int.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_strtod.c Make MSVCRT memory leak checking usable for the test suite 2020-01-23 11:47:20 +01:00
zend_strtod.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_ts_hash.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_ts_hash.h Fix typos in code comments in Zend/ [skip ci] 2019-02-18 17:56:28 +01:00
zend_type_info.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_types.h Addirional fix for bug #78918 2019-12-11 12:21:49 +03:00
zend_variables.c Remove local variables 2019-02-03 21:03:00 +01:00
zend_variables.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_virtual_cwd.c Merge branch 'PHP-7.3' into PHP-7.4 2020-10-26 12:40:56 +01:00
zend_virtual_cwd.h Remove tsrm_config_common.h 2019-07-13 01:58:01 +02:00
zend_vm_def.h Avoid non-object in FE_FREE 2020-10-12 09:45:52 +02:00
zend_vm_execute.h Avoid non-object in FE_FREE 2020-10-12 09:45:52 +02:00
zend_vm_execute.skl Fix several mostly Windows related phpdbg bugs 2020-05-26 17:45:25 +02:00
zend_vm_gen.php Apply tidy formatting 2020-02-03 13:41:31 +01:00
zend_vm_handlers.h Avoid over-specialization 2019-07-24 19:51:56 +03:00
zend_vm_opcodes.c Avoid over-specialization 2019-07-24 19:51:56 +03:00
zend_vm_opcodes.h Replace ZEND_ASSIGN_ADD (and others) by ZEND_ASSIGN_OP, ZEND_ASSIGN_DIM_OP, ZEND_ASSGIN_OBJ_OP and ZEND_ASSIGN_STATIC_PROP_OP 2019-07-05 12:03:25 +03:00
zend_vm_trace_handlers.h Adios, yearly copyright ranges 2019-01-30 11:48:28 +01:00
zend_vm_trace_map.h Adios, yearly copyright ranges 2019-01-30 11:48:28 +01:00
zend_vm.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_weakrefs.c Better hot/cold code splitting 2019-05-31 12:20:21 +03:00
zend_weakrefs.h Fix duplicate symbols _zend_ce_weakrefs 2019-03-13 11:38:21 +01:00
zend.c Fixed bug #80362: Running dtrace scripts can cause php to crash 2020-11-24 13:01:51 +01:00
zend.h 7.3.25 is next 2020-10-13 09:52:46 +02:00
Zend.m4 Merge branch 'PHP-7.3' into PHP-7.4 2020-10-05 10:46:46 +02:00

Zend Engine

Zend memory manager

General

The goal of the new memory manager (available since PHP 5.2) is to reduce memory allocation overhead and speedup memory management.

Debugging

Normal:

sapi/cli/php -r 'leak();'

Zend MM disabled:

USE_ZEND_ALLOC=0 valgrind --leak-check=full sapi/cli/php -r 'leak();'

Shared extensions

Since PHP 5.3.11 it is possible to prevent shared extensions from unloading so that valgrind can correctly track the memory leaks in shared extensions. For this there is the ZEND_DONT_UNLOAD_MODULES environment variable. If set, then DL_UNLOAD() is skipped during the shutdown of shared extensions.

ZEND_VM

ZEND_VM architecture allows specializing opcode handlers according to op_type fields and using different execution methods (call threading, switch threading and direct threading). As a result ZE2 got more than 20% speedup on raw PHP code execution (with specialized executor and direct threading execution method). As in most PHP applications raw execution speed isn't the limiting factor but system calls and database calls are, your mileage with this patch will vary.

Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can find opcode handlers and helpers. The typical opcode handler template looks like this:

ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
{
    <HANDLER'S CODE>
}

<OPCODE-NUMBER> is a opcode number (0, 1, ...) <OPCODE> is an opcode name (ZEN_NOP, ZEND_ADD, :) <OP1_TYPES> and <OP2_TYPES> are masks for allowed operand op_types. Specializer will generate code only for defined combination of types. You can use any combination of the following op_types UNUSED, CONST, VAR, TMP and CV also you can use ANY mask to disable specialization according operand's op_type. <HANDLER'S CODE> is a handler's code itself. For most handlers it stills the same as in old zend_execute.c, but now it uses macros to access opcode operands and some internal executor data.

You can see the conformity of new macros to old code in the following list:

EXECUTE_DATA
    execute_data
ZEND_VM_DISPATCH_TO_HANDLER(<OP>)
    return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
ZEND_VM_DISPATCH_TO_HELPER(<NAME>)
    return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>)
    return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
ZEND_VM_CONTINUE()
    return 0
ZEND_VM_NEXT_OPCODE()
    NEXT_OPCODE()
ZEND_VM_SET_OPCODE(<TARGET>
    SET_OPCODE(<TARGET>
ZEND_VM_INC_OPCODE()
    INC_OPCOD()
ZEND_VM_RETURN_FROM_EXECUTE_LOOP()
    RETURN_FROM_EXECUTE_LOOP()
ZEND_VM_C_LABEL(<LABEL>):
    <LABEL>:
ZEND_VM_C_GOTO(<LABEL>)
    goto <LABEL>
OP<X>_TYPE
    opline->op<X>.op_type
GET_OP<X>_ZVAL_PTR(<TYPE>)
    get_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
GET_OP<X>_ZVAL_PTR_PTR(<TYPE>)
    get_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
GET_OP<X>_OBJ_ZVAL_PTR(<TYPE>)
    get_obj_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
GET_OP<X>_OBJ_ZVAL_PTR_PTR(<TYPE>)
    get_obj_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
IS_OP<X>_TMP_FREE()
    IS_TMP_FREE(free_op<X>)
FREE_OP<X>()
    FREE_OP(free_op<X>)
FREE_OP<X>_IF_VAR()
    FREE_VAR(free_op<X>)
FREE_OP<X>_VAR_PTR()
    FREE_VAR_PTR(free_op<X>)

Executor's helpers can be defined without parameters or with one parameter. This is done with the following constructs:

ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>)
{
    <HELPER'S CODE>
}

ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>)
{
    <HELPER'S CODE>
}

Executor's code is generated by PHP script zend_vm_gen.php it uses zend_vm_def.h and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and zend_vm_execute.h. The first file is a list of opcode definitions. It is included from zend_compile.h. The second one is an executor code itself. It is included from zend_execute.c.

zend_vm_gen.php can produce different kind of executors. You can select different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can disable opcode specialization using --without-specializer. You can include or exclude old executor together with specialized one using --without-old-executor. At last you can debug executor using original zend_vm_def.h or generated file zend_vm_execute.h. Debugging with original file requires --with-lines option. By default ZE2 uses the following command to generate executor:

php zend_vm_gen.php --with-vm-kind=CALL