0
0
mirror of https://github.com/php/php-src.git synced 2024-12-23 00:40:33 +08:00
php-src/Zend
Nikita Popov ca652aafa8 Fixed bug
I'm going for a very conservative fix here, where the previous
logic is restored for the case where an object is passed to
method_exists(). We might want to check against EG(scope) instead,
but this seems like a safer choice.

This means that behavior in PHP 7.4 changes only for
method_exists('C', 'privateMethodNotOnC'), which should be sensible.
2019-10-04 12:41:49 +02:00
..
tests Fixed bug 2019-10-04 12:41:49 +02:00
bench.php Trim trailing whitespace in source code files 2018-10-13 14:17:28 +02:00
LICENSE Trim trailing whitespace in source code files 2018-10-13 14:17:28 +02:00
Makefile.frag Fixed bug 2019-06-05 10:04:57 +02:00
micro_bench.php Trim trailing whitespace in source code files 2018-10-13 14:17:28 +02: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 2019-10-04 09:11:18 +02:00
zend_alloc.h Try to control ZEND_MM_ALIGNED_SIZE type 2019-06-12 13:17:25 +02:00
zend_API.c Fix : is_callable() on FFI\CData throws Exception 2019-09-19 09:13:22 +02: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 Merge branch 'PHP-7.3' into PHP-7.4 2019-09-26 10:25:55 +02: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 Fixed bug 2019-10-04 12:41:49 +02:00
zend_builtin_functions.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_closures.c 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_closures.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_compile.c Fix use-after-free with delayed interned memoized const operand 2019-10-04 10:38:11 +02:00
zend_compile.h Define OBJ_PROP_TO_OFFSET() using XtOffsetOf() 2019-09-14 00:24:54 +02: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 Update and fix remaining year ranges (2019) 2019-02-08 23:14:29 +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 simple ignore arguments in exceptions implementation 2019-07-02 13:18:39 +02:00
zend_exceptions.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_execute_API.c Remove func copy optimization for private method with static vars 2019-10-01 13:04:06 +02:00
zend_execute.c Fixed bug (Crash when using undefined variable as object 2019-09-13 01:42:02 +03:00
zend_execute.h Cleanup 2019-06-21 11:43:17 +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 Remove local variables 2019-02-03 21:03:00 +01:00
zend_float.h Fix typos in code comments in Zend/ [skip ci] 2019-02-18 17:56:28 +01:00
zend_gc.c Fixed bug 2019-09-24 12:17:21 +02:00
zend_gc.h Set expectation to reduce hot code fragmentation 2019-07-10 18:29:35 +03:00
zend_generators.c Merge branch 'PHP-7.3' into PHP-7.4 2019-08-14 17:53:24 +02: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 Fixed bug 2019-08-12 10:45:13 +02:00
zend_hash.c Assert that HT entries using add_new APIs are really new 2019-07-04 17:12:55 +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 Remove func copy optimization for private method with static vars 2019-10-01 13:04:06 +02:00
zend_inheritance.h Allow throwing exception while loading parent class 2019-09-12 16:41:18 +02:00
zend_ini_parser.y Use %define api.pure instead of %pure-parser 2019-06-12 09:26:34 +02:00
zend_ini_scanner.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_ini_scanner.l Revert "Rename *.l files to *.re" 2019-05-20 06:06:38 +02:00
zend_ini.c Remove local variables 2019-02-03 21:03:00 +01: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 new_variable '{' expr '}' is deprecated as well 2019-09-09 19:05:23 +02:00
zend_language_scanner.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_language_scanner.l Fixed bug 2019-09-30 10:41:14 +02: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 Merge branch 'PHP-7.3' into PHP-7.4 2019-08-08 10:07:39 +03: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 Merge branch 'PHP-7.3' into PHP-7.4 2019-08-13 09:54:44 +02:00
zend_objects.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_opcode.c Don't use needs_live_range hook for "special" live ranges 2019-08-26 16:12:03 +02:00
zend_operators.c Merge branch 'PHP-7.3' into PHP-7.4 2019-09-26 13:47:41 +02:00
zend_operators.h Merge branch 'PHP-7.3' into PHP-7.4 2019-09-16 15:01:14 +02:00
zend_portability.h Include stddef.h in zend_portability.h for offsetof() macro 2019-09-14 00:24:47 +02: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 Merge branch 'PHP-7.3' into PHP-7.4 2019-07-29 17:14:40 +02: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 Fixed bug 2019-07-29 10:07:12 +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 Allow exceptions in __toString() 2019-06-05 14:25:07 +02:00
zend_strtod_int.h Remove local variables 2019-02-03 21:03:00 +01:00
zend_strtod.c Suppress overflow UB in zend_strtod 2019-06-19 15:57:57 +02: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 Generalize delref assertion 2019-08-13 11:44:54 +02: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 2019-08-19 19:58:45 +02:00
zend_virtual_cwd.h Remove tsrm_config_common.h 2019-07-13 01:58:01 +02:00
zend_vm_def.h Handle resources used as array keys consistently 2019-09-27 10:40:41 +02:00
zend_vm_execute.h Handle resources used as array keys consistently 2019-09-27 10:40:41 +02:00
zend_vm_execute.skl Disable "bad" optimisations only for emulation loop 2019-05-30 20:35:30 +03:00
zend_vm_gen.php Remove HOT attribute from some VM handlers. Comparisons almost always followed by JMPZ/JMPNZ; JMPZNZ is rare used. 2019-09-05 11:40:15 +03: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 Set PROPERTY_TYPES_RESOLVED flag for internal classes 2019-07-04 10:32:36 +02:00
zend.h PHP 7.3.10RC1 has been tagged 2019-09-10 15:11:54 +02:00
Zend.m4 Simplify functions checks in m4 2019-07-17 03:50:47 +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