php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Code Issues Packages Projects Releases Wiki Activity
127,703 Commits 549 Branches 1,485 Tags
dfe9c2af19a0e7621dacbd44c83ea0b94af8b113
Commit Graph

4983 Commits

Author SHA1 Message Date
Dmitry Stogov 42eed7bb4e Fix GH-10271: Incorrect arithmetic calculations when using JIT 2023-01-16 14:51:26 +03:00
Thomas Gerbet 1f715f5658 Use absolute paths in OPCache tests when calling opcache_compile_file() 
This make sure the tests do not fail if they are not run from the
repository root.

Closes GH-10266

Signed-off-by: George Peter Banyard <girgias@php.net>
 2023-01-12 15:47:24 +00:00
Dmitry Stogov 4d4a53beee Fix incorrect optimization of ASSIGN_OP may lead to incorrect result (sub assign -> pre dec conversion for null values) 2023-01-09 13:51:57 +03:00
Max Kellermann bcc5d268f6 ext/opcache/jit/zend_jit_trace: fix memory leak in _compile_root_trace() (#10146) 
A copy of this piece of code exists in zend_jit_compile_side_trace(),
but there, the leak bug does not exist.

This bug exists since both copies of this piece of code were added in
commit 4bf2d09ede
 2023-01-09 09:50:30 +03:00
Max Kellermann e217138b40 ext/opcache/jit/zend_jit_trace: add missing lock for EXIT_INVALIDATE 
Commit 6c25413183 added the flag ZEND_JIT_EXIT_INVALIDATE which
resets the trace handlers in zend_jit_trace_exit(), but forgot to
lock the shared memory section.

This could cause another worker process who still saw the
ZEND_JIT_TRACE_JITED flag to schedule ZEND_JIT_TRACE_STOP_LINK, but
when it arrived at the ZEND_JIT_DEBUG_TRACE_STOP, the handler was
already reverted by the first worker process and thus
zend_jit_find_trace() fails.

This in turn generated a bogus jump offset in the JITed code, crashing
the PHP process.
 2022-12-29 12:20:56 +00:00
Max Kellermann b26b758952 ext/opcache/jit: handle zend_jit_find_trace() failures 
Commit 6c25413 added the flag ZEND_JIT_EXIT_INVALIDATE which resets
the trace handlers in zend_jit_trace_exit(), but forgot to consider
that on ZEND_JIT_TRACE_STOP_LINK, this changed handler gets passed to
zend_jit_find_trace(), causing it to fail, either by returning 0
(results in bogus data) or by aborting due to ZEND_UNREACHABLE().  In
either case, this crashes the PHP process.

I'm not quite sure how to fix this multi-threading problem properly;
my suggestion is to just fail the zend_jit_trace() call.  After all,
the whole ZEND_JIT_EXIT_INVALIDATE fix was about reloading modified
scripts, so there's probably no point in this pending zend_jit_trace()
call.
 2022-12-26 21:17:19 +00:00
Niels Dossche bbad29b9c1 Add a regression test for auto_globals_jit=0 with preloading on 2022-12-22 17:42:11 +01:00
Niels Dossche c4487b7a12 Initialize ping_auto_globals_mask to prevent undefined behaviour 
Closes GH-10121
 2022-12-22 14:59:24 +01:00
Max Kellermann d3a6eedf4a ext/opcache/jit/zend_jit: fix inverted bailout value in zend_runtime_jit() (#10144) 
In the "catch" block, do_bailout must be set to true, not false, or
else zend_bailout() never gets called.
 2022-12-21 14:53:21 +01:00
Arnaud Le Blanc 91b3b58f71 Do not resolve constants on non-linked class during preloading (#9975) 
Fixes GH-9968
 2022-11-25 14:02:45 +01:00
Dmitry Stogov a8bd342397 Fix memory leak 
Fizes oss-fuzz #53143
 2022-11-14 12:35:09 +03:00
Dmitry Stogov f31f464cec Fix memory leak 
Fixes oss-fuzz #52999
 2022-11-07 11:07:58 +03:00
Ilija Tovilo 537a104f14 Fix user path in test 2022-10-25 13:03:55 +02:00
Kévin Dunglas af75eaf9bf opcache: fix syntax error introduced in 261a08af65 (#9821) 2022-10-24 20:42:55 +03:00
Dmitry Stogov 261a08af65 JIT: Fix incorrect EX(opline) override 
Fixes oss-fuzz #52674
 2022-10-24 12:02:28 +03:00
Dmitry Stogov 61e563ca40 Reset JIT for dynamic functions on opcache restrart 2022-10-17 11:26:30 +03:00
Dmitry Stogov 3e076ddf06 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Discard disasm symbols on opcache restart
 2022-10-17 11:24:00 +03:00
Dmitry Stogov cefb228e15 Discard disasm symbols on opcache restart 2022-10-17 11:22:59 +03:00
Dmitry Stogov c5364b851a Fix crashes after opcache restart 2022-10-11 14:23:12 +03:00
Dmitry Stogov e81b6bf018 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix typo
 2022-10-05 21:39:37 +03:00
Dmitry Stogov 072dc3c857 Fix typo 2022-10-05 21:39:16 +03:00
Dmitry Stogov 5877b84056 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix register allocation (missing store)
 2022-10-03 17:09:01 +03:00
Dmitry Stogov ed652a514f Fix register allocation (missing store) 
This fixes oss-fuzz #52022
 2022-10-03 17:08:11 +03:00
Dmitry Stogov da28a6b497 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix abstract trace consisency for FE_FETCH instruction
 2022-10-03 14:51:21 +03:00
Dmitry Stogov 5ca4113386 Fix abstract trace consisency for FE_FETCH instruction 2022-10-03 14:48:03 +03:00
Dmitry Stogov aa179bf3dd Force exit to VM 2022-09-29 15:27:38 +03:00
Ilija Tovilo 0aa5adb143 Fix invalid label before } 
Will be fixed in C23 :)

Closes GH-9624
 2022-09-27 23:27:17 +02:00
Dmitry Stogov 2568db287d Wrap JIT compiler with zend_try to recover in case of memory overflow 2022-09-27 22:28:16 +03:00
wxue1 52f4ed16e0 Indirect call reduction for Jit code 
Changing indirect call to direct call for Jit code
benefits the branch prediction, which gets 1% performance
gain in our workload.
Similarly, we change indirect jump to direct jump.

Signed-off-by: Su, Tao <tao.su@intel.com>
Signed-off-by: Wang, Xue <xue1.wang@intel.com>
 2022-09-22 11:22:27 +01:00
Dmitry Stogov 3a46f9fd1d Intern string values of internal classes to prevent their future interning during inheritance. 2022-09-20 20:43:29 +03:00
Dmitry Stogov 20d1d234ca Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning.
 2022-09-19 17:19:19 +03:00
Dmitry Stogov e488f7b0eb Reorder conditions to avoid valgrind "Conditional jump or move depends on uninitialised value" warning. 2022-09-19 17:17:53 +03:00
Arnaud Le Blanc 466e4dc2a2 Check return value of zend_jit_trace_get_exit_addr() (#9097) 2022-09-09 10:50:03 +02:00
Máté Kocsis 59180b50b3 Fix inexistent skipif.inc 2022-09-05 12:37:53 +02:00
Dmitry Stogov c852e0fff9 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix type inference
 2022-09-05 12:56:34 +03:00
Dmitry Stogov 81cb005ef7 Fix type inference 
Fixes oss-fuzz #50792
 2022-09-05 12:55:50 +03:00
Dmitry Stogov 4845d7026a Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  typo
 2022-08-29 17:13:16 +03:00
Dmitry Stogov 263a07e5b0 typo 2022-08-29 17:12:57 +03:00
Dmitry Stogov 172ac0a48d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix memory leak
 2022-08-29 14:54:40 +03:00
Dmitry Stogov 4135e6011c Fix memory leak 
Fixes oss-fuzz #50616
 2022-08-29 14:53:48 +03:00
Dmitry Stogov a516e2992d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix ext/opcache/tests/jit/inc_obj_004.phpt failure introduced by fd74ee7e90
 2022-08-29 12:35:46 +03:00
Dmitry Stogov ce42dcf483 Fix ext/opcache/tests/jit/inc_obj_004.phpt failure introduced by fd74ee7e90 
This should fix GH-9445
 2022-08-29 12:30:14 +03:00
Dmitry Stogov 95befc786a Fix type inference 
Fixes oss-fuzz #50272
 2022-08-22 21:11:39 +03:00
Dmitry Stogov 2a33280ceb Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Make code generation to be consistent with register allocation
 2022-08-22 19:55:10 +03:00
Dmitry Stogov fd74ee7e90 JIT: Make code generation to be consistent with register allocation 
Fixes ext/opcache/tests/jit/add_014.phpt with opcache.jit=1205
 2022-08-22 19:53:33 +03:00
Dmitry Stogov 5762fc52c6 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Tracing JIT: Fix incorrect guard elimination
 2022-08-22 15:39:47 +03:00
Dmitry Stogov c9c51eb1f1 Tracing JIT: Fix incorrect guard elimination 
Fixes oss-fuzz #49917
 2022-08-22 15:38:41 +03:00
David Carlier 9360cd6add Merge branch 'PHP-8.0' into PHP-8.1 2022-08-19 16:40:54 +01:00
David Carlier 52e312afb8 opcache jit fix message format for OpenBSD. 
like macOs it requires `ll`.
Closes #9380.
 2022-08-19 16:40:29 +01:00
Tim Starling 410e5d48a3 Fix GCC 9.4 uninitialized variable warning 
ext/opcache/zend_accelerator_blacklist.c:295:4: error: ‘blacklist_path_length’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
 2022-08-19 12:46:55 +01:00