Dmitry Stogov
4ee72a8dda
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Backport fix for HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag (#12591 )
2023-11-03 10:55:33 +03:00
Dmitry Stogov
6bf4041398
Backport fix for HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag ( #12591 )
...
* Fixed HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag
This fixes GH-12527
* typo
2023-11-03 10:54:57 +03:00
Dmitry Stogov
83bbea7c5b
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Don't JIT after fatal errors
2023-11-02 14:15:05 +03:00
Dmitry Stogov
bbf2fc99a3
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Don't JIT after fatal errors
2023-11-02 14:14:48 +03:00
Dmitry Stogov
77a497d56a
Don't JIT after fatal errors
2023-11-02 14:14:12 +03:00
Dmitry Stogov
22735b3ff5
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT
ext/intl: change when the locale is invalid for the 8.1/8.2 serie.
2023-11-02 08:15:50 +03:00
Dmitry Stogov
177a6f5d8a
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT
2023-11-02 08:11:00 +03:00
Dmitry Stogov
798b9d097b
Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT
2023-11-02 08:09:29 +03:00
Dmitry Stogov
916fa73d80
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fixed inorrect QM_ASSIGN elimination
2023-11-01 09:55:37 +03:00
Dmitry Stogov
125dbb2c03
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fixed inorrect QM_ASSIGN elimination
2023-11-01 09:55:28 +03:00
Dmitry Stogov
19dfe05f16
Fixed inorrect QM_ASSIGN elimination
...
Fixes oss-fuzz #63771
2023-11-01 09:54:58 +03:00
Dmitry Stogov
cefe9e4ef4
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Backport fix for incorrect assumption about in-memory zval type
2023-10-31 11:59:17 +03:00
Dmitry Stogov
4b82ed4387
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Backport fix for incorrect assumption about in-memory zval type
2023-10-31 11:59:08 +03:00
Dmitry Stogov
455a967934
Backport fix for incorrect assumption about in-memory zval type
2023-10-31 11:56:01 +03:00
Dmitry Stogov
586b2f8645
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fixed GH-12511: Use must be in next opline assertion with patched infection
2023-10-31 07:52:46 +03:00
Dmitry Stogov
14b36c8583
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fixed GH-12511: Use must be in next opline assertion with patched infection
2023-10-31 07:52:38 +03:00
Dmitry Stogov
b3b46a44c5
Fixed GH-12511: Use must be in next opline assertion with patched infection
2023-10-31 07:51:36 +03:00
Dmitry Stogov
e52d617934
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fixed GH-12509: JIT assertion when running php-parser tests
2023-10-26 23:59:12 +03:00
Dmitry Stogov
770c1b0361
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fixed GH-12509: JIT assertion when running php-parser tests
2023-10-26 23:59:03 +03:00
Dmitry Stogov
5f46d86955
Fixed GH-12509: JIT assertion when running php-parser tests
2023-10-26 23:58:29 +03:00
Dmitry Stogov
7d67b19325
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fixed regression intoduced by 76c41d27f9
2023-10-25 15:15:48 +03:00
Dmitry Stogov
76724fc4ac
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fixed regression intoduced by 76c41d27f9
2023-10-25 15:15:39 +03:00
Dmitry Stogov
fbf4e196da
Fixed regression intoduced by 76c41d27f9
2023-10-25 15:15:13 +03:00
Dmitry Stogov
574b0573ac
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fixed incorrect type inference
2023-10-24 18:49:18 +03:00
Dmitry Stogov
7320f33f7f
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fixed incorrect type inference
2023-10-24 18:48:58 +03:00
Dmitry Stogov
aa45df4849
Fixed incorrect type inference
2023-10-24 18:48:29 +03:00
Dmitry Stogov
a0ce5299fe
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fixed GH-12482: Abortion with tracing JIT
2023-10-24 14:21:32 +03:00
Dmitry Stogov
9668077f6b
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fixed GH-12482: Abortion with tracing JIT
2023-10-24 14:21:06 +03:00
Dmitry Stogov
76c41d27f9
Fixed GH-12482: Abortion with tracing JIT
2023-10-24 14:20:35 +03:00
Dmitry Stogov
1f25dea498
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
memory_consumption must be page aligned
2023-10-23 12:11:01 +03:00
Dmitry Stogov
fed7937d27
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
memory_consumption must be page aligned
2023-10-23 12:10:54 +03:00
Dmitry Stogov
e270ee3008
memory_consumption must be page aligned
2023-10-23 12:10:11 +03:00
Dmitry Stogov
a1818dd00c
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fixed GH-12494: Zend/tests/arginfo_zpp_mismatch.phpt causes a segfault withJIT + --repeat 2
2023-10-23 10:51:59 +03:00
Dmitry Stogov
6be3c18d38
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fixed GH-12494: Zend/tests/arginfo_zpp_mismatch.phpt causes a segfault withJIT + --repeat 2
2023-10-23 10:51:48 +03:00
Dmitry Stogov
e0ca4dca5b
Fixed GH-12494: Zend/tests/arginfo_zpp_mismatch.phpt causes a segfault withJIT + --repeat 2
2023-10-23 10:50:55 +03:00
Ilija Tovilo
874f966cbc
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Avoid JIT warning with opcache.jit_buffer_size=0
2023-10-18 10:49:14 +02:00
Ilija Tovilo
b49e178563
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Avoid JIT warning with opcache.jit_buffer_size=0
2023-10-18 10:49:07 +02:00
Ilija Tovilo
07d81592e9
Avoid JIT warning with opcache.jit_buffer_size=0
...
Closes GH-12460
2023-10-18 10:46:30 +02:00
Dmitry Stogov
a831cbcde4
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fixed GH-11917: primitives seem to be passed via reference instead of by value under some conditions when JIT is enabled on windows (#12451 )
2023-10-17 01:58:49 +03:00
Dmitry Stogov
ef91794264
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fixed GH-11917: primitives seem to be passed via reference instead of by value under some conditions when JIT is enabled on windows (#12451 )
2023-10-17 01:58:36 +03:00
Dmitry Stogov
89eb1c64a9
Fixed GH-11917: primitives seem to be passed via reference instead of by value under some conditions when JIT is enabled on windows ( #12451 )
2023-10-17 01:58:07 +03:00
Dmitry Stogov
d2cf3a45b5
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fixed GH-12428: Assertion with function/tracing JIT
2023-10-16 15:12:38 +03:00
Dmitry Stogov
0c6999cf94
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fixed GH-12428: Assertion with function/tracing JIT
2023-10-16 15:12:29 +03:00
Dmitry Stogov
dabced0fbb
Fixed GH-12428: Assertion with function/tracing JIT
2023-10-16 15:11:56 +03:00
Ilija Tovilo
477aadedc7
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Report warning if JIT cannot be enabled
2023-10-11 12:12:30 +02:00
Ilija Tovilo
18942459a2
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Report warning if JIT cannot be enabled
2023-10-11 12:11:59 +02:00
Daniil Gentili
7177461141
Report warning if JIT cannot be enabled
...
Closes GH-12404
2023-10-11 12:10:48 +02:00
Dmitry Stogov
5553092d85
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Reset inheritance_cache pointer of zend_class_entry upon serialization (#12401 )
2023-10-11 09:57:43 +03:00
Dmitry Stogov
310b5283eb
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Reset inheritance_cache pointer of zend_class_entry upon serialization (#12401 )
2023-10-11 09:57:35 +03:00
Sergei Turchanov
90f2e7607a
Reset inheritance_cache pointer of zend_class_entry upon serialization ( #12401 )
...
to opcache filecache. Usually, when a class is being loaded, a dependency
tracking is performed after the call to zend_file_cache_script_store.
But sometimes, when opcache cache is empty and there are many simultaneous
outstanding requests for compilation, some classes do have their
inheritance_cache initialized before the call to zend_file_cache_script_store,
and in that case this pointer is serialized as-is. And when such a class
is loaded from opcache filecache this pointer also loaded as-is, and now
it points to some random location in memory. This causes segfaults occuring
when traversing inheritance_cache of such classes.
We need to reset inheritance_cache pointer of zend_class_entry
upon serialization. This should have been done anyway since it is a sensible
strategy to sanitize any memory pointer upon serialization (either by calling
SERIALIZE_x macros or setting to NULL or any other deterministic value).
2023-10-11 09:57:18 +03:00