zend_is_callable_ex() can unfortunately emit a deprecation, and then
a user error handler can throw an exception. This causes an assert
failure at ZEND_VM_NEXT_OPCODE(). We fix this by checking if there's an
exception after zend_is_callable_ex().
Closes GH-16803.
The `get_method` object handler may change the object pointer. SPL does
this in its iterator implementations. This causes the error message
to change to another class which is confusing to the user. JIT handles
this correctly. This patch aligns behaviour with JIT.
Closes GH-16576.
* PHP-8.4:
[ci skip] NEWS for GH-15960
Deny resetting an object as lazy during property iteration
Ensure to initialize lazy object in foreach
Do not null out obj->properties when resetting object
Fix handling of undef property during foreach by ref on hooked class
* Implement JIT for ZEND_FETCH_STATIC_PROP_* and improve interpretation
* Revert incorrect change
* Use FASTCALL calling convention
* Use EMPTY_SWITCH_DEFAULT_CASE
* Move the loading of the property info into zend_jit_uninit_static_prop()
zend_get_property_info_for_slot(obj, slot) assumes that 'slot' belongs to 'obj', but that may not be the case for lazy proxies.
Fortunately, the property info is often already available in path when it is needed.
For other cases, I make zend_get_property_info_for_slot() aware of lazy objects, and add zend_get_property_info_for_slot_self() for cases where the 'slot' is known to belong to the object itself.
Fixes oss-fuzz #71446
* Check VM interrupt while internal frame is on top
* Use tab instead of spaces
* fix frame used in interrupt and refactor
* remove unused failures for zend_jit_check_timeout
* Fix JIT support
Co-authored-by: Bob Weinand <bobwei9@hotmail.com>
* Fix the missing store to vm_interrupt
* Rename new functions
* Special case zend_interrupt_function in JIT code
* refactor to use ZEND_VM_SET_OPCODE_NO_INTERRUPT
* Split atomic exchange into load + store
It is difficult to determine performance of atomics sometimes. In this
case, the separate load+store is still correct, and a load does not
cause a modification, and might be faster for some platforms than an
exchange. A load+store is slower than an exchange, but we're fine
trading the penalty to the slow path and keeping the happy path faster.
---------
Co-authored-by: Bob Weinand <bobwei9@hotmail.com>
YIELD and YIELD_FROM increment opline before returning, but in most places
we need the opline to point to the YIELD and YIELD_FROM.
Here I change YIELD / YIELD_FROM to not increment opline. This simplifies the
code and fixes GH-15275 in a better way.
Closes GH-15328
This flag was never necessary. We know a static variable is uninitialized (i.e.
the initializer has never been called) iff the zval in the static variable array
does not contain a reference.
Prompted by a related issue in ext-uopz reported by Christoph.
The zend_object.properties HashTable needs to be built just in time by calling
rebuild_object_properties() on the object before accessing it. Normally this is
done automatically in zend_std_get_properties(), but we do it manually in a few
places.
In this change I introduce an inline variant of zend_std_build_properties(), and
refactor these places to use it instead of calling rebuild_object_properties()
manually.
rebuild_object_properties() renamed as rebuild_object_properties_internal(), to
enforce usage of zend_std_get_properties() or zend_std_build_properties_ex().
Closes GH-14996
Inline the lookup whether a function is observed at all.
This strategy is also used for FRAMELESS calls. If the frameless call is observed, we instead allocate a call frame and push the arguments, to call the the function afterwards.
Doing so is still a performance benefit as opposed to executing individual INIT_FCALL+SEND_VAL ops. Thus, even if the frameless call turns out to be observed, the call overhead is slightly lower than before.
If the internal function is not observed at all, the unavoidable overhead is fetching the FLF zend_function pointer and the run-time cache needs to be inspected.
As part of this work, it turned out to be most viable to put the result operand on the ZEND_OP_DATA instead of ZEND_FRAMELESS_ICALL_3, allowing seamless interoperability with the DO_ICALL opcode.
This is a bit unusual in comparison to all other ZEND_OP_DATA usages, but seems to not pose problems overall.
There is also a small issue resolved: trampolines would always use the ZEND_CALL_TRAMPOLINE_SPEC_OBSERVER function due to zend_observer_fcall_op_array_extension being set to -1 too late.
Previously this returned `int`. Many functions actually take advantage
of the fact this returns exactly 0 or 1. For instance,
`main/streams/xp_socket.c` does:
sockopts |= STREAM_SOCKOP_IPV6_V6ONLY_ENABLED * zend_is_true(tmpzval);
And `Zend/zend_compile.c` does:
child = &ast->child[2 - zend_is_true(zend_ast_get_zval(ast->child[0]))];
I changed a few places trivially from `int` to `bool`, but there are
still many places such as the object handlers which return `int` that
should eventually be `bool`.
* Make `ReflectionGenerator::getFunction()` legal after generator termination
* Expose the generator function name via `Generator::__debugInfo()`
* Allow creating `ReflectionGenerator` after termination
* Reorder `struct _zend_generator` to avoid a hole
* Adjust `ext/reflection/tests/028.phpt`
This is legal now.
* Fix Generator Closure collection
* Add test to verify the Closure dies with the generator
* NEWS / UPGRADING
* fix segfault in `ZEND_BIND_STATIC`
In case a `ZEND_BIND_STATIC` is being executed, while the current chunk is full,
the `zend_array_dup()` call will trigger a OOM in ZendMM which will crash, as
the opline might be a dangling pointer.
* add missing test
* `assert()`ing seems easier than trying to make the compiler to not optimize
* moved from function call to INI setting, so we can use this in other places as well
* make `assert()` work no NDEBUG builds
* document magic number
* fix segfault in `ZEND_FUNC_GET_ARGS`
In case a `ZEND_FUNC_GET_ARGS` is being executed, while the current chunk is
full, the `zend_new_array()` call will trigger a OOM in ZendMM which will crash,
as the opline might be a dangling pointer.
---------
Co-authored-by: Florian Engelhardt <florian@engelhardt.tc>
* IR update
* Use folding to allow constant folding and common subexpression elimination
* Implement IR JIT for INIT_FCALL, INIT_FCALL_BY_NAME and INIT_NS_FCALL_BY_NAME
* Implement IR JIT for SEND_VAL and SEND_VAL_EX
* Implement IR JIT for SEND_REF
* Implement IR JIT for SEND_VAR* instructions (incompltere - few tests failures)
* Implement IR JIT for CHECK_FUNC_ARG
* Implement IR JIT for CHECK_UNDEF_ARGS
* Implement IR JIT for ROPE_INIT, ROPE_ADD and ROPE_END
* Implement IR JIT for FREE, FE_FREE, ECHO, STRLEN and COUNT
* Implement IR JIT for IN_ARRAY
* Implement IR JIT support for separate VM stack overflow check
* Implement IR JIT for INIT_DYNAMIC_CALL
* Implemenr IR JIT for INIT_METHOD_CALL
* Fix IR JIT for IN_ARRAY and COUNT
* Implement IR JIT for VERIFY_RETURN_TYPE
* Force C compiler to store preserved registers to allow JIT using them
* Implement IR JIT for DO_FCALL, DO_UCALL, DO_ICALL and DO_FCALL_BY_NAME
* Implement IR JIT for FETCH_CONSTANT
* Fix (reverse) guard conditions
* Implement IR JIT for RECV and RECV_INIT
* Implement IR JIT for RETURN
* Implement IR JIT for BIND_GLOBAL
* Fix guard for: int++ => double
* Fix exception handling
* Allow deoptimization of zval type only (if some register is spilled by the IR engine)
* Fix overflow handling
* Implement IR JIT for FE_RESET_R and FE_FETCH_R
* Eliminate extra temporary register
* Better registers usage
* Implement IR JIT for FETCH_DIM_* and ISSET_DIM
* Implement IR JIT for ASSIGN_DIM and ASSIGN_DIM_OP
* cleanup
* Generae IR that produces a better x86[_64] code
* Allow trace register allocation for live ranges terminated before entering a called function
* Remove following END->BEGIN nodes during IR construction
* Remove useless (duplicate) guard
* Avoid useless exception check
* Prevent duplicate store
* Eliminate repatable re-assignment of stack zval types
* Enable combination of some instructions with the following SEND_VAL for IR JIT
* Avoid generation of useless RLOADs
* Eliminatare refcouting in a sequence of FETCH_DIM_R
* Fix assertion
* Remove ZREG_ZVAL_ADDREF flag from an element of abstract stack
* Implement IR JIT for FETCH_OBJ_*
* Implement IR JIT for ASSIGN_OBJ
* Implement IR JIT for ASSIGN_OBJ_OP
* cleanup
* Implement IR JIT for (PRE/POST)_(INC/DEC)_OBJ
* ws
* cleanup
* Fix IR JIT for constructor call
* Fix opcache.jit=1201 IR JIT.
With opcache.jit=1201 we still have to generate code for follow and target basic blocks with single exiting VM instruction. We mat just omit the entry point.
* Fix IR construction for the case when both IF targets are the same
* Avoid PHP LEAVE code duplication in function IR JIT.
* Reload operands from memeory when overflow (this improves hot code)
* Implement IR JIT for SWITCH_LONG, SWITCH_STRING and MATCH
* Initialize result to IS_UNDEF
* Fix JIT integraion with observer (Zend/tests/gh10346.phpt failure)
* Fix incorrect compilation of FE_FETCH with predicted empty array
* Fix register allocation
* Use sign extension inxted of zero
* Fix trace register allocator
* cleanp
* Fix address sanitizer warning
* Calculate JIT trace prologue sixe on startup (to avoid magic constants).
* Add cgecks for merge arrays overflow (this should be refactored using lists)
* Cache TLS access to perform corresponding read once per basic block
* cleanup unused variable
* Fix IR JIT support for CLANG build (CALL VM without global register variables)
* Fix IR JIT for CALL VM with global register variables
* Allow %rpb ysage in JIT for CALL VM (we save and restore it in prologue/epilogue anyway)
* cleanup
* Allocate enough fixed stack to keep preserved registers
* We don't have to care about x29 and x30
* cleanup (JMPZ/NZ_EX work fine)
* Revert "cleanup (JMPZ/NZ_EX work fine)"
This reverts commit cf8dd74a040e225d290d8ac4f5e33df638e6f8b8.
* Don't allocate register for PHP variables that are loaded from memory and used once
* Eliminate redundand deoptimization stores
* cleanup
* cleanup
* cleanup
* Optimization for constant comparison
* Cleanup and elimination of dead deoptimization stores
* Eliminate duplicate constant loading
* Set proper initial SP offset info for GDB backtraces
This doesn't take into account the following SP/FP modifications
* Add spill stores
* Remove low limit on number of deoptimization constants
* Emit dead code only when it's really necessary for IR graph
* cleanup
* cleanup
* Prefer loading long constants from memory (instead of loading immediate value)
* Regiter disasm labels using macros (add missing helpers)
* Make IR franework to care about GUARD JMP reordering
* Avoid reloading
* Improve register allocation for IR tracing JIT
* Add comment
* Fix deoptimization on result type guard of FETCH_DIM_R and FETCH_OBJ_R
* If HYBRID VM can't provide some stack space for JIT code in "red zone" then JIT has to reserve stack space itself
* Dump IR for stubs only if disassembling of stubs is requested
* Revert "Dump IR for stubs only if disassembling of stubs is requested"
This reverts commit d8b56bec129bc23c2b16f1f3c6367190181b6fdb.
* Dump IR for stubs only if disassembling of stubs is requested (another approach)
* Improve overflow deoptimization for ADD(_,1) and SUB(_,1)
Now we deoptimize to the next instruction, load constant result, and remove op1 from SNAPSHOT
* Switch to IR Builder API
* Switch to new IR builder macros
* Fix jit_set_Z_TYPE_INFO() call. op3 is a simple constant (not a ir_ref).
* Generate better code
* Enable empty ENTRY block merging
* Improve code generated for array separation/creation before an update
(ASSIGN_DIM, ASSING_DIM_OP, etc)
* Fix incorrect deleteion of PHI source (op1 is used for control link)
* Load constant once
* cleanup
* Improve control-flow to avoid two IS_ARRAY checks for REFERENCEs
* Update comments
* cleanup
* Clenup comments
* Fix AAarch 64 build (disable stack adjustment auto-detection)
* Add filename and line number to closure names
* Reserve stack for parameter passing
* Increase size of CPU stack reserved for JIT-ed code
* Fix addess sanitizer warnings
* Clenup: introduce OPTIMIZE_FOR_SIZE macro (disabled by default)
* Port 08e7591206 to IR JIT
Fix (at lease part of the) #GH-10635: ARM64 function JIT causes impossible assertion
* cleanup
* Preload constant and use tests that may be compiled into better code
* Convert helpers to stubs
* Introduce a helper data structure (ir_refs) to collect references for the following use in (MERGE/PHI)_N
* Use ir_refs
* Improve code generated by zend_jit_zval_copy_deref()
* Use "cold" attribute to influence IR block scheduler and achieve better code layout
* Keep info collected by recursion analyzer
* Use HTTPS URL to allow fetching without a SSH key
* Update IR
* Update IR
* Add IR JIT support for Wondows (Win64 support is incomplete)
* Update IR
* Update IR
* Fix support for Windows ZTS build
* Fix stack alignment
* Cleanup ir_ctx.control usage
* Fixed support for irreducable (incomplete) and merged loops
* Revert "Fixed support for irreducable (incomplete) and merged loops"
This reverts commit 672b5b89f47e8b81745fb73c86e0bcb0937daf16.
* Generate better code for RECV_ENTRies
* Use simpler and more efficient checks
* Switch to new ENTRY node concept
* Limit register usage across the OSR ENTRY point
* Upate MEM type only if we write to memory
* Use LOOP_END without a reference edge
* Use new ir_init() prototype
* Delay LOAD for better LOAD fusion
* Fix RECV/RECV_INIT compilation with opcache.jit=1235
* iPtoperly compile fake closures (they mau be called as regular functions)
* Fix reabase
* Fix rebase and add --with-capstone support for IR JIT
* Replace zend_uchar -> uint8_t
* IR JIT support for delayed destructor for zend_assign_to_typed_ref/prop
* Handle zend_execute_internal in IR JIT
* Fix readonly+clone IR JIT issues
* Switch to ir_ctx.mflags
* Ckeanup "inputs_count" access
* Disable CSE for nodes bound to PHP local varibles
The stack slots for temporaty variables may be reused and in case of
spilling this may cause clobbering of the value.
(ext/standard/tests/strings/htmlentities20.phpt on x86 with tracing JIT)
* Fix deoptimization code when link traces
See ext/zlib/tests/bug75273.phpt failure
* Fix missing type store
This fixes ext/openssl/tests/openssl_error_string_basic_openssl3.phpt
* Fix tracing JIT for overflowing INC/DEC
Fixes tests/lang/operators/preinc_basiclong_64bit.phpt
* Remove ir_remove_unreachable_blocks() call. Now it's called by ir_build_cfg(), when necessary.
* IR JIT: Fixed inaccurate range inference usage for UNDEF/NULL/FALSE
* IR JIT: Fixed GH-11127 (JIT fault)
* Avoid allocation of unused exit point
* Don't record already stored PHP variables in SNAPSHOTs
* Delay variable load
* Disable CSE across ENTRY
* Fixed disabling CSE
* Fix deoptimization
* Fixed deoptimization
* Disable incorrect register allocation
* Fix JIT for INDENTICAL+JMPZ_EX
* Add comments
* Fixed missed type stores
* IR JIT: added support for CLDEMOTE
* Fixed incorrect constant usage
* Disable compilation of PHP functions with irreducible CGF
* Fixed liveness check
* Fixed code for constant conditional jump
* Add type store to avoid use-after-free
* Fixed liveness analyses
* Gnerate SNAPSHOT for virtual method calls
* More accurate search for staticaly inferred info about a trace SSA vaiable
* Fix incorrect result use type_info
* Fix JMPZ/NZ_EX support and missing type store
* Fixed trace type inference and missing type store
* Store type of unused CV to prevent possible following use after free
* Fixed deoptimizaton info
* Fixed stack layout
* Implemented support for veneers on AArch64
* Dsable CSE to avoid over-optimization
* Don't bind nodes for TMP PHP variables
* Re-enable CSE for temporary variables as we don't bind them anymore
* Switch to CPU stack spill slots
* Add codegen info dump
* Initialize CV variables through FP (this enables some folding optimizatios)
* Use zero-extension that can be eliminated
* Avoid generation of dead PHIs
* Increase preallocated spill stack size
* Enable IR based JIT by default
* Fixed build with -disable-opcache-jit
* Use explicit type conversion & force load values to registerts
* Fix IR build
* Checkout submodules in github actions
* Fixed Windows build
* Fixed Windows build
* Fixed reattach to IR JIT SHM
* Update IR
* Checkout submodules in nightly CI
* Fix MACOS ZTS in IR JIT
* Update ir
* Fixed incorrect register allocation
* Fixed incorect code generation
* Fixed tracing jit for BIND_INIT_STATIC_OR_JMP
* Update README
* Typos
* Revert JIT disabling for run-tests.php workers
* Fixed code review issues
* Update IR
* Update IR
* Update IR
* Allow exit_point duplication, when the deoptimization info differs because of spilling
* Use bound spill slots for CV (once again)
* Improve error handling
* Removed IR submodule
* Remove IR submodule from workflows
* Embed IR
IR commit: 8977307f4e96ee03847d7f2eb809b3080f9ed662
* Add .gitignore
* Fixed according to feedback
* Force C saving preserved registers only for HYBRID VM
* Update IR
IR commit: a2f8452b3d35a756cba38924f5c51a48a7207494
* cleanup
* Replace ZEND_ASSERT(0) by ZEND_UNREACHABLE()
* Update IR and remove unused IR files
IR commit: 399a38771393c202a741336643118991290b4b1b
* Fixed inconsistency between IR code-generation and register-allocation
* Update IR
IR commit: 86685504274b0c71d9985b3c926dccaca2cacf9b
* Update ir_PHI*() according to IR construction API changes
* Fixed 32-bit build
* Update IR
IR commit: d0686408e20cd8c8640e37ed52ab81403a2383cb
* Support for ir_TAILCALL() prototype changes
* Update IR
IR commit: d72ae866e09d17e879378767aceb91d51894818c
* Fixed incorrect extension (ZEXT->SEXT)
* Fix SSA dominance
* Update IR
IR commit: d60d92516dc5f89b93cdf1df7a54141e83226b07
* Fixed support ir_ctx.ret_type
We require valid code for compilation to succeed, but these paths should always
be guarded by OPx_TYPE checks and never execute. Add an assertion to verify.
