Dmitry Stogov
04064187c2
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fixed type inference (ASSIGN_OP with typed reference may cause type conversion)
2021-10-11 10:50:06 +03:00
Dmitry Stogov
ed8ec9d71e
Fixed type inference (ASSIGN_OP with typed reference may cause type conversion)
2021-10-11 10:48:49 +03:00
Nikita Popov
a4b209fdcf
Make weak ref notify robust against bailout
...
First drop it from EG(weakrefs), as the weakref_unref operation
may call a destructor, which may bail out.
Fixes oss-fuzz #39718 .
2021-10-08 16:42:43 +02:00
Nikita Popov
d001682ac4
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fixed bug #81494
2021-10-08 15:02:29 +02:00
Nikita Popov
df940a6dc3
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fixed bug #81494
2021-10-08 15:00:51 +02:00
Nikita Popov
fcabe693ba
Fixed bug #81494
...
Use the proper error reporting mechanism rather than throwing a
warning. This requires something of a hack because we don't have
direct access to the connection object at this point.
2021-10-08 15:00:10 +02:00
Derick Rethans
7af0bf4d07
Merge branch 'PHP-8.0' into PHP-8.1
2021-10-08 13:52:34 +01:00
Derick Rethans
b230593b0e
Merge branch 'PHP-7.4' into PHP-8.0
2021-10-08 13:52:18 +01:00
Derick Rethans
9733d49e14
Remove now superfluous tests due to changes in tzdata
2021-10-08 13:51:21 +01:00
Dmitry Stogov
30f1f4b75b
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fixed incorrect double/long register hinting
2021-10-08 15:47:21 +03:00
Dmitry Stogov
bbd875268a
JIT: Fixed incorrect double/long register hinting
2021-10-08 15:46:49 +03:00
Derick Rethans
2d0d76cfd6
Merge branch 'PHP-8.0' into PHP-8.1
2021-10-08 13:13:22 +01:00
Derick Rethans
617c156d94
Merge branch 'PHP-7.4' into PHP-8.0
2021-10-08 13:13:14 +01:00
Derick Rethans
bcc103a402
Merge branch 'PHP-7.3' into PHP-7.4
2021-10-08 13:13:05 +01:00
Derick Rethans
32c0850b4a
Revert "Updated to version 2021.3 (2021c)"
...
This reverts commit e81554c6e6 .
2021-10-08 13:12:50 +01:00
Nikita Popov
7f0d3f5413
Fixed bug #81502
...
Allow $tag to be null. This is the value that openssl_encrypt()
sets it to for non-AEAD ciphers, so we should also accept this
as an input to openssl_decrypt().
Prior to PHP 8.1, null was accepted in weak mode due to the special
treatment of null arguments to internal functions.
2021-10-08 14:07:05 +02:00
Derick Rethans
7ad877ced1
Updated to version 2021.3 (2021c)
2021-10-08 12:54:54 +01:00
Derick Rethans
43b39fd02c
Empty merge
2021-10-08 12:54:54 +01:00
Derick Rethans
c55b41d658
Updated to version 2021.3 (2021c)
2021-10-08 12:54:53 +01:00
Derick Rethans
2d44367b3f
Empty merge
2021-10-08 12:54:53 +01:00
Derick Rethans
8a61f1ece6
Updated to version 2021.3 (2021c)
2021-10-08 12:54:52 +01:00
Derick Rethans
760475b43a
Empty merge
2021-10-08 12:54:51 +01:00
Derick Rethans
e81554c6e6
Updated to version 2021.3 (2021c)
2021-10-08 12:54:50 +01:00
Dmitry Stogov
26bc7b38fb
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fixed extension handling
2021-10-08 14:08:34 +03:00
Dmitry Stogov
b279de416e
JIT: Fixed extension handling
2021-10-08 14:06:32 +03:00
Nikita Popov
41789e1fc9
Regenerate optimizer info
...
While the stub definitions were updated, the generated optimizer
info was stale.
2021-10-08 11:40:38 +02:00
Dmitry Stogov
b2c43a4efb
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Flush error messages emitted during preloading
2021-10-08 12:35:38 +03:00
Dmitry Stogov
45b127ad4a
Flush error messages emitted during preloading
2021-10-08 12:34:25 +03:00
Nikita Popov
bd3e536383
Fixed bug #81514
...
Objects reuse the GC_PERSISTENT flag as IS_OBJ_WEAKLY_REFERENCED,
which we did not account for in ZVAL_COPY_OR_DUP. To make things
worse the incorrect zval_copy_ctor_func() invocation silently did
nothing. To avoid that, add an assertion that it should only be
called with arrays and strings (unlike the normal zval_copy_ctor()
which can be safely called on any zval).
2021-10-08 10:31:24 +02:00
Dmitry Stogov
c9fb384c40
JIT ARM64: Use proper register
2021-10-08 09:56:44 +03:00
Dmitry Stogov
d12d987686
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fixed FETCH_LIST_R on string
2021-10-07 22:15:30 +03:00
Dmitry Stogov
7cea20f937
JIT: Fixed FETCH_LIST_R on string
2021-10-07 22:13:39 +03:00
Dmitry Stogov
6bf1d24fbc
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fixed bug #81512 (Unexpected behavior with arrays and JIT)
2021-10-07 21:29:04 +03:00
Dmitry Stogov
b47a48ff80
Fixed bug #81512 (Unexpected behavior with arrays and JIT)
2021-10-07 21:24:38 +03:00
Nikita Popov
90ceac6f7c
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix failing PDO PgSQL test
2021-10-07 20:11:53 +02:00
Nikita Popov
56c9ea1881
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix failing PDO PgSQL test
2021-10-07 20:11:26 +02:00
Nikita Popov
c0cbf3a6eb
Fix failing PDO PgSQL test
...
This now prints an additional
> CONTEXT: unnamed portal parameter $1 = ''
on azure, presumably as a result of a version update or configuration
change. Strip this additional line from the error info, the same as
already done in one other place in the test.
2021-10-07 20:10:45 +02:00
Derick Rethans
544aebb102
Merge branch 'PHP-8.0' into PHP-8.1
2021-10-07 17:03:32 +01:00
Derick Rethans
7426b2277d
Merge branch 'PHP-7.4' into PHP-8.0
2021-10-07 17:03:12 +01:00
Derick Rethans
89dfe49321
Bump config.guess/config.sub in all supported branches to support Apple Silicon
2021-10-07 17:02:39 +01:00
Derick Rethans
ec75116744
Merge branch 'PHP-8.0' into PHP-8.1
2021-10-07 17:00:21 +01:00
Derick Rethans
8e61a3e3ac
Merge branch 'PHP-7.4' into PHP-8.0
2021-10-07 16:59:47 +01:00
Derick Rethans
cd0c32e7fb
Bump config.guess/config.sub in all supported branches to support Apple Silicon
2021-10-07 16:59:00 +01:00
Nikita Popov
71e82b9de2
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Check exception after undef var notice
2021-10-07 17:01:16 +02:00
Nikita Popov
b564113756
Check exception after undef var notice
...
For simple assignments, we may not emit an exception check elsewhere,
so perform it directly after the undef var notice.
2021-10-07 16:54:26 +02:00
Nikita Popov
d5e4f8ffe8
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Handle undefined dim in assign_dim_helper
2021-10-07 15:35:45 +02:00
Nikita Popov
08c29a657d
Handle undefined dim in assign_dim_helper
...
Not only the value can be undefined here, but the offset as well.
2021-10-07 15:35:16 +02:00
Nikita Popov
e32c850d4f
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Set opline before calling undef op helper
JIT: Fixed wrong comparison skip
2021-10-07 14:40:38 +02:00
Nikita Popov
455837139e
Set opline before calling undef op helper
2021-10-07 14:38:02 +02:00
Máté Kocsis
d9e5e63032
Add more specific array return type hints for various extensions - part 6 ( #7474 )
2021-10-07 14:29:29 +02:00