Remove unnecessary wrapper function

This seems to date back to a time where zval_ptr_dtor was a macro
implicitly passing additional parameters.

Don't exclude arrays from constant collection

These are supported as constants nowadays, so we can drop the
string check.

Also fix a potential leak, though I believe this doesn'

Don't exclude arrays from constant collection

These are supported as constants nowadays, so we can drop the
string check.

Also fix a potential leak, though I believe this doesn't matter in
current usage, as it will effectively be suppressed during persist.

show more ...

Move FETCH_CLASS+INSTANCEOF special case out of update_op1_const()

The generic code was rejecting this to go into a special code path
in SCCP. We should directly do that in SCCP instead,

Move FETCH_CLASS+INSTANCEOF special case out of update_op1_const()

The generic code was rejecting this to go into a special code path
in SCCP. We should directly do that in SCCP instead, to still allow
the generic (and valid) replacement.

show more ...

Don't replace SEND opcodes with different by-ref behavior

update_op1_const() implements the right logic here -- these cannot
be replaced by different opcodes, as the by-ref passing behav

Don't replace SEND opcodes with different by-ref behavior

update_op1_const() implements the right logic here -- these cannot
be replaced by different opcodes, as the by-ref passing behavior
is not the same.

show more ...

Remove redundant code in zend_optimizer_replace_by_const()

zend_optimizer_update_op1_const() already handles these cases.

Merge branch 'PHP-8.1'

* PHP-8.1:
Optimize closures nested in other closures

Optimize closures nested in other closures

Use more compact representation for packed arrays.

- for packed arrays we store just an array of zvals without keys.
- the elements of packed array are accessible throuf as ht->arPacked[

Use more compact representation for packed arrays.

- for packed arrays we store just an array of zvals without keys.
- the elements of packed array are accessible throuf as ht->arPacked[i]
instead of ht->arData[i]
- in addition to general ZEND_HASH_FOREACH_* macros, we introduced similar
familied for packed (ZEND_HASH_PACKED_FORECH_*) and real hashes
(ZEND_HASH_MAP_FOREACH_*)
- introduced an additional family of macros to access elements of array
(packed or real hashes) ZEND_ARRAY_ELEMET_SIZE, ZEND_ARRAY_ELEMET_EX,
ZEND_ARRAY_ELEMET, ZEND_ARRAY_NEXT_ELEMENT, ZEND_ARRAY_PREV_ELEMENT
- zend_hash_minmax() prototype was changed to compare only values

Because of smaller data set, this patch may show performance improvement
on some apps and benchmarks that use packed arrays. (~1% on PHP-Parser)

TODO:
- sapi/phpdbg needs special support for packed arrays (WATCH_ON_BUCKET).
- zend_hash_sort_ex() may require converting packed arrays to hash.

show more ...

Merge branch 'PHP-8.1'

* PHP-8.1:
Handle operand replacement in JMP_NULL

Handle operand replacement in JMP_NULL

In this case it's not sufficient to replace the JMP_NULL operand,
as it keeps the temporary alive and there may be more uses later.
Fix this by

Handle operand replacement in JMP_NULL

In this case it's not sufficient to replace the JMP_NULL operand,
as it keeps the temporary alive and there may be more uses later.
Fix this by generalizing existing handling for other similar opcodes
like CASE/SWITCH and LIST_R.

Fixes oss-fuzz 5820123475214336.

show more ...

Merge branch 'PHP-8.1'

* PHP-8.1:
Fix cache slot assignment for ASSIGN_OBJ_OP

Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
Fix cache slot assignment for ASSIGN_OBJ_OP

Voidify zend_optimize_script()

It always returned 1

As a consequence voidify preload_optimize()

Voidify zend_build_call_graph()

It always returned SUCCESS

Use more appropriate types in Optimizer

Mainly using zend_result and bool instead of int

Avoid accessing literal operand on nop

This would have create a NOP with a CONST operand ... probably
harmless in practice, but we should avoid it.

Fixed some spaces used instead of tabs

Extract helper for fetching class entry in optimizer

This code is repeated a few time. Two occurrences additionally
contained checks for user classes in CG(class_table) with the
same

Extract helper for fetching class entry in optimizer

This code is repeated a few time. Two occurrences additionally
contained checks for user classes in CG(class_table) with the
same file name, but as far as I know these should always be in
the script class_table, so I'm omitting the check here.

show more ...

Support custom passes in Optimizer

Export zend_unary_op_produces_error() and use in optimizer

Don't repeat this logic, as it's going to become more complex.

Remove error suppression from zend_optimizer_eval_binary_op()

All error conditions should be handled by
zend_binary_op_produces_error().

Pointed out by Girgias.

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 ...

Remove unnecessary php.h includes from Zend/

The Zend/ directory really shouldn't be including php headers.
These particular includes are plain unnecessary.

Introduce pseudo-keyword ZEND_FALLTHROUGH

And use it instead of comments

Support prototypes in call graph

Even if we don't know the exact method being called, include it
in the call graph with the is_prototype flag. In particular, we
can still make use of

Support prototypes in call graph

Even if we don't know the exact method being called, include it
in the call graph with the is_prototype flag. In particular, we
can still make use of return types from prototype methods, as
PHP 8 makes LSP violations a hard error.

Most other places are adjusted to skip calls with !is_prototype.
Maybe some of them would be fine, but ignoring them is conservative.

show more ...