Christoph M. Becker
845a67feb5
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #81424 : PCRE2 10.35 JIT performance regression
2021-10-12 14:21:09 +02:00
Christoph M. Becker
788a701e22
Fix #81424 : PCRE2 10.35 JIT performance regression
...
We backport the respective upstream fix[1] to our bundled pcre2lib plus
the follow-up fix[2] for a functional regression.
[1] <dc5f966635 >
[2] <e7af7efaa1 >
Closes GH-7573.
2021-10-12 14:19:22 +02:00
Christoph M. Becker
d130f90f72
[ci skip] Fix NEWS
...
PHP 8.0.12RC1 has already been tagged a week ago, so later changes
target PHP 8.0.13.
2021-10-12 14:14:37 +02:00
Nikita Popov
a2e3ca1f5b
Don't free FETCH_W operand if GLOBAL_LOCK
...
The error path performed the free unconditionally, while we should
not do it for GLOBAL_LOCK.
Fixes oss-fuzz #39868 .
2021-10-12 12:44:35 +02:00
Máté Kocsis
2127b49c65
String default values are enclosed in quotes rather than apostrophes
2021-10-12 09:51:20 +02:00
Máté Kocsis
17fa9b77bd
Fix the return type of imagecolorexactalpha()
2021-10-12 09:51:13 +02:00
Dmitry Stogov
a4c41d45cd
Fixed type inference for COPY_TMP
2021-10-11 16:56:07 +03:00
Dmitry Stogov
ccdda69a18
JIT: Fixed usage of incorrect specialized zval destructor
2021-10-11 13:00:23 +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
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
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
bbd875268a
JIT: Fixed incorrect double/long register hinting
2021-10-08 15:46:49 +03: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
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
b279de416e
JIT: Fixed extension handling
2021-10-08 14:06:32 +03:00
Dmitry Stogov
45b127ad4a
Flush error messages emitted during preloading
2021-10-08 12:34:25 +03:00
Dmitry Stogov
7cea20f937
JIT: Fixed FETCH_LIST_R on string
2021-10-07 22:13:39 +03:00
Dmitry Stogov
b47a48ff80
Fixed bug #81512 (Unexpected behavior with arrays and JIT)
2021-10-07 21:24:38 +03: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
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
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
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
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
455837139e
Set opline before calling undef op helper
2021-10-07 14:38:02 +02:00
Dmitry Stogov
a743fd7633
JIT: Fixed wrong comparison skip
2021-10-07 15:27:56 +03:00
Dmitry Stogov
6ab36fb6f9
JIT: Fixed incorrect reference handling in PRE_INC/DEC_OBJ
2021-10-07 14:34:18 +03:00
Dmitry Stogov
cd45bd0a81
JIT: Fixed incorrect code generation for JMPZ
2021-10-07 13:48:28 +03:00
Nikita Popov
c69ffa8f84
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fixed bug #54350
2021-10-07 11:46:10 +02:00
Nikita Popov
1519770288
Fixed bug #54350
...
Don't allow calling fclose() on the stream while in the user
filter callback. This is basically the same protection as xp_ssl
streams use during callback invocations.
There are more issues in this general area (e.g. stack overflow
on stream_filter_remove), but this addresses freeing the stream
during the filter callback invocation at least.
2021-10-07 11:44:41 +02:00
Dmitry Stogov
8a0873020a
JIT: Fixed NaN handling
2021-10-06 16:35:33 +03:00
Dmitry Stogov
f681f9075c
JIT: Fixed register clobbering
2021-10-06 12:10:39 +03:00
Dmitry Stogov
69fb20f106
Fixed assign coalesce. "$a[0] ??= $a" should evaluate the right $a first.
2021-10-05 20:23:56 +03:00
Derick Rethans
0eb7a1576d
Merge branch 'PHP-7.4' into PHP-8.0
2021-10-05 17:25:57 +01:00
Derick Rethans
e5d35a3252
Prepare branch for 7.4.26-dev
2021-10-05 17:25:43 +01:00
Matteo Beccati
9af6882d28
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Add test for pg_put_line() and pg_end_copy()
2021-10-05 17:44:19 +02:00
Matteo Beccati
be36bf5aca
Add test for pg_put_line() and pg_end_copy()
2021-10-05 17:43:48 +02:00
Nikita Popov
11a9b036a8
Fix duplicate undef warning in assign_dim_op
...
In case of auto-vivification we were fetching dim twice and as
such also emitting the undef var warning twice.
2021-10-05 15:51:11 +02:00
Nikita Popov
f890c9c5e3
Fix return type verification with undef var
...
This was loading EG(uninitialized_value) into r0 rather than
FCARG1a.
However, if we fix this issue an existing test fails because
the undef var warning promoted to exception is not caught early
enough, so we need to explicitly check for the exception before
performing the type check.
2021-10-05 15:30:55 +02:00
Dmitry Stogov
22ef1fb832
Fixed SSA construction
2021-10-05 16:14:39 +03:00