Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
Fixed inorrect QM_ASSIGN elimination

Fixed inorrect QM_ASSIGN elimination

Fixes oss-fuzz #63771

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
Fixed incorrect QM_ASSIGN elimination

Fixed incorrect QM_ASSIGN elimination

Fixes OSS Fuzz #60895

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
Fixed incorrect QM_ASSIGN elimination

Fixed incorrect QM_ASSIGN elimination

Fixes OSS Fuzz #60735

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
Fix GH-11245 (In some specific cases SWITCH with one default statement will cause segfault)

Fix GH-11245 (In some specific cases SWITCH with one default statement will cause segfault)

The block optimizer pass allows the use of sources of the preceding
block if the block is a fo

Fix GH-11245 (In some specific cases SWITCH with one default statement will cause segfault)

The block optimizer pass allows the use of sources of the preceding
block if the block is a follower and not a target. This causes issues
when trying to remove FREE instructions: if the source is not in the
block of the FREE, then the FREE and source are still removed. Therefore
the other successor blocks, which must consume or FREE the temporary,
will still contain the FREE opline. This opline will now refer to a
temporary that doesn't exist anymore, which most of the time results in
a crash. For these kind of non-local scenarios, we'll let the SSA
based optimizations handle those cases.

Closes GH-11251.

show more ...

Fix incorrect optimization

Fixes oss-fuzz #57482

Merge branch 'PHP-8.1' into PHP-8.2

Fix incorrect comparison in block optimization pass

We're in the case of ZEND_JMPZ_EX or ZEND_JMPNZ_EX. The opcode gets
overwritten and only after the overwriting gets checked if we're i

Fix incorrect comparison in block optimization pass

We're in the case of ZEND_JMPZ_EX or ZEND_JMPNZ_EX. The opcode gets
overwritten and only after the overwriting gets checked if we're in a
JMPZ or JMPNZ case. This results in a wrong optimization.

Close GH-10329

show more ...

Fix memory leak because of incorrect optimization

Fixes oss-fuzz #54488

Merge branch 'PHP-8.1'

* PHP-8.1:
Fix memory leak

Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
Fix memory leak

Merge branch 'PHP-8.1'

* PHP-8.1:
Optimizer: Fix inorrect constant substitution in FETCH_LIST_R

Optimizer: Fix inorrect constant substitution in FETCH_LIST_R

Fixes oss-fuzz #45429

Remove JMPZNZ opcode

While JMPZNZ can avoid execution of a separate JMP opcode in some
cases, it also prevents smart branch optimization, so creating
JMPZNZ may actually have a negat

Remove JMPZNZ opcode

While JMPZNZ can avoid execution of a separate JMP opcode in some
cases, it also prevents smart branch optimization, so creating
JMPZNZ may actually have a negative effect. It also adds additional
complexity for optimizations.

Drop JMPZNZ in favor of JMPZ+JMP or JMPNZ+JMP.

Closes GH-7857.

show more ...

Add helper for convertion to CHECK_VAR/FREE/NOP

This is a recurring pattern whenever an instruction with an
operand is deleted.

Merge branch 'PHP-8.1'

* PHP-8.1:
Don't start new block after loop free

Don't start new block after loop free

This reverts the change from 493c91c7429ee4552d2b80a2648271e2ba97f15c.
Starting a new block means that in the common case where the loop var
fre

Don't start new block after loop free

This reverts the change from 493c91c7429ee4552d2b80a2648271e2ba97f15c.
Starting a new block means that in the common case where the loop var
free is not unreachable, we'll always merge back the block.

Instead fix the original problem by explicitly removing instructions
apart from the loop var free in block pass.

show more ...

Fix delayed early binding with optimization

It's possible for delayed early binding opcodes to get optimized
away if they are "unreachable". However, we still need to attempt
early b

Fix delayed early binding with optimization

It's possible for delayed early binding opcodes to get optimized
away if they are "unreachable". However, we still need to attempt
early binding for them. (In some cases we also corrupt the early
binding list outright during optimization, which is how I got here.)

Fix this by storing information about delayed early binding
independently of DECLARE_CLASS_DELAYED opcodes, so early binding is
performed even after the opcode has been dropped.

show more ...

Voidify zend_build_cfg()

It always returned SUCCESS

Use more appropriate types in Optimizer

Mainly using zend_result and bool instead of int

Remove special UNREACHABLE_FREE handling in block pass

This results in an assertion failure when running under -e,
because there is an additional EXT_STMT + NOP before the FREE.
I do

Remove special UNREACHABLE_FREE handling in block pass

This results in an assertion failure when running under -e,
because there is an additional EXT_STMT + NOP before the FREE.
I don't think there's a strong reason to handle UNREACHABLE_FREE
specially here (it's only important that we *do* handle it), so
I'm dropping the code rather than adjusting it to scan over
certain opcodes.

show more ...

Update http->https in license (#6945)

1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as

Update http->https in license (#6945)

1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as 3.0 states "php 5.1.1, 4.1.1, and earlier".
3. In some license comments is "at through the world-wide-web" while most is without "at", so deleted.
4. fixed indentation in some files before |

show more ...