php-src/Zend
Nikita Popov 2e218180ef Release call trampolines in zpp fcc
When using zpp 'f' or Z_PARAM_FUNC, if the fcc points to a call
trampoline release it immediately and force zend_call_function
to refetch it. This may require additional callability checks
if __call is used, but avoids the need to carefully free fcc
values in all internal functions -- in some cases this is not
simple, as a type error might be triggered by a later argument
in the same zpp call.

This fixes oss-fuzz #25390.

Closes GH-6073.
2020-09-04 14:23:14 +02:00
..
tests Merge branch 'PHP-7.4' 2020-09-04 11:00:45 +02:00
bench.php
LICENSE
Makefile.frag
micro_bench.php
README.md
zend_alloc_sizes.h
zend_alloc.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_alloc.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_API.c Release call trampolines in zpp fcc 2020-09-04 14:23:14 +02:00
zend_API.h Release call trampolines in zpp fcc 2020-09-04 14:23:14 +02:00
zend_arena.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_ast.c Change Attribute Syntax from @@ to #[] 2020-09-02 20:26:50 +02:00
zend_ast.h Change Attribute Syntax from @@ to #[] 2020-09-02 20:26:50 +02:00
zend_attributes_arginfo.h
zend_attributes.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_attributes.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_attributes.stub.php
zend_bitset.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_build.h
zend_builtin_functions_arginfo.h Add a few missing parameter types in stubs 2020-07-30 14:26:45 +02:00
zend_builtin_functions.c Release call trampolines in zpp fcc 2020-09-04 14:23:14 +02:00
zend_builtin_functions.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_builtin_functions.stub.php Add a few missing parameter types in stubs 2020-07-30 14:26:45 +02:00
zend_closures_arginfo.h Fix bug #78770 2020-08-14 10:24:06 +02:00
zend_closures.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_closures.h Cleanup argument handling in ext/reflection 2020-07-24 17:47:42 +02:00
zend_closures.stub.php Fix bug #78770 2020-08-14 10:24:06 +02:00
zend_compile.c Fix leaks in sapi tests 2020-09-03 12:59:30 +02:00
zend_compile.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_config.w32.h
zend_constants.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_constants.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_cpuinfo.c
zend_cpuinfo.h X86: Fast CRC32 computation using PCLMULQDQ instruction 2020-09-02 15:10:41 +02:00
zend_default_classes.c
zend_dtrace.c Introduce error notification callbacks that are run independant of zend_error_cb 2020-07-17 15:08:11 +02:00
zend_dtrace.d
zend_dtrace.h Introduce error notification callbacks that are run independant of zend_error_cb 2020-07-17 15:08:11 +02:00
zend_errors.h
zend_exceptions_arginfo.h
zend_exceptions.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_exceptions.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_exceptions.stub.php
zend_execute_API.c Add zend_observer API 2020-09-01 09:59:59 -06:00
zend_execute.c Fix by-ref list assign LIST_W+MAKE_REF separation 2020-09-02 10:26:55 +02:00
zend_execute.h Remove unnecessary cache_slot arguments 2020-08-28 17:15:09 +02:00
zend_extensions.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_extensions.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_float.c
zend_float.h
zend_gc.c
zend_gc.h
zend_gdb.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_gdb.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_generators_arginfo.h
zend_generators.c Merge branch 'PHP-7.4' 2020-09-02 10:53:44 +02:00
zend_generators.h
zend_generators.stub.php
zend_globals_macros.h
zend_globals.h Remove CG(filenames_table) 2020-09-03 11:33:54 +02:00
zend_hash.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_hash.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_highlight.c
zend_highlight.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_inheritance.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_inheritance.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_ini_parser.y Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_ini_scanner.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_ini_scanner.l Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_ini.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_ini.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_interfaces_arginfo.h Add a few missing parameter types in stubs 2020-07-30 14:26:45 +02:00
zend_interfaces.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_interfaces.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_interfaces.stub.php Add a few missing parameter types in stubs 2020-07-30 14:26:45 +02:00
zend_istdiostream.h
zend_iterators.c
zend_iterators.h
zend_language_parser.y Change Attribute Syntax from @@ to #[] 2020-09-02 20:26:50 +02:00
zend_language_scanner.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_language_scanner.l Merge branch 'PHP-7.4' 2020-09-04 11:00:45 +02:00
zend_list.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_list.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_llist.c
zend_llist.h
zend_long.h
zend_map_ptr.h
zend_modules.h Fix mismatch between macro and struct definition 2020-09-03 14:01:45 +02:00
zend_multibyte.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_multibyte.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_multiply.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_object_handlers.c Merge branch 'PHP-7.4' 2020-09-01 15:17:28 +02:00
zend_object_handlers.h Promote warnings to exceptions in ext/simplexml 2020-08-25 15:15:58 +02:00
zend_objects_API.c
zend_objects_API.h
zend_objects.c Review the usage of apostrophes in error messages 2020-07-10 21:05:28 +02:00
zend_objects.h
zend_observer.c Add zend_observer API 2020-09-01 09:59:59 -06:00
zend_observer.h Add zend_observer API 2020-09-01 09:59:59 -06:00
zend_opcode.c Don't intern compiled_filename 2020-09-03 12:31:23 +02:00
zend_operators.c Move custom type checks to ZPP 2020-09-02 11:11:38 +02:00
zend_operators.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_portability.h X86: Fast CRC32 computation using PCLMULQDQ instruction 2020-09-02 15:10:41 +02:00
zend_ptr_stack.c
zend_ptr_stack.h
zend_range_check.h
zend_signal.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_signal.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_smart_str_public.h
zend_smart_str.c
zend_smart_str.h
zend_smart_string_public.h
zend_smart_string.h
zend_sort.c
zend_sort.h
zend_stack.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_stack.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_stream.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_stream.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_string.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_string.h Merge branch 'PHP-7.4' 2020-09-03 09:51:54 +02:00
zend_strtod_int.h
zend_strtod.c
zend_strtod.h
zend_ts_hash.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_ts_hash.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_type_info.h Infer information about packed/hash arrays and use it for JIT 2020-08-25 18:28:23 +03:00
zend_types.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_variables.c
zend_variables.h Drop various unused macros/APIs 2020-08-26 12:59:43 +02:00
zend_virtual_cwd.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_virtual_cwd.h Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_vm_def.h Merge branch 'PHP-7.4' 2020-09-03 17:13:47 +02:00
zend_vm_execute.h Merge branch 'PHP-7.4' 2020-09-03 17:13:47 +02:00
zend_vm_execute.skl Add zend_observer API 2020-09-01 09:59:59 -06:00
zend_vm_gen.php Add zend_observer API 2020-09-01 09:59:59 -06:00
zend_vm_handlers.h Add zend_observer API 2020-09-01 09:59:59 -06:00
zend_vm_opcodes.c Implement named parameters 2020-07-31 15:53:36 +02:00
zend_vm_opcodes.h Implement named parameters 2020-07-31 15:53:36 +02:00
zend_vm_trace_handlers.h
zend_vm_trace_lines.h
zend_vm_trace_map.h
zend_vm.h
zend_weakrefs_arginfo.h Add more precise type info for stubs 2020-09-01 16:35:56 +02:00
zend_weakrefs.c Improve type declarations for Zend APIs 2020-08-28 15:41:27 +02:00
zend_weakrefs.h Fix warnings of strict-prototypes 2020-07-23 00:59:00 +08:00
zend_weakrefs.stub.php Add more precise type info for stubs 2020-09-01 16:35:56 +02:00
zend.c Add zend_observer API 2020-09-01 09:59:59 -06:00
zend.h Merge branch 'PHP-7.4' 2020-08-30 17:06:59 +08:00
Zend.m4 Prepend compiler warning flags to CFLAG instead to append them 2020-09-01 14:45:57 +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