php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
126,087 Commits 549 Branches 1,485 Tags
2e65c8e581bd60d6fb84fbffca56b1cedb7f0c76
Commit Graph

149 Commits

Author SHA1 Message Date
Nikita Popov 9c1d7b43e9 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Don't replace tmp with cv in YIELD argument
 2021-10-12 14:27:07 +02:00
Dmitry Stogov 1208fe932a Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed type inference for COPY_TMP
 2021-10-11 16:56:40 +03:00
Nikita Popov f0cf999223 Preserve key/value type invariant in range() type inference 
Don't set PACKED key type if no value type is set.

Fixes oss-fuzz 6718410667458560.
 2021-10-11 12:41:46 +02:00
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
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
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
Dmitry Stogov 0b5d62e39c Fixed type inference that may cause JIT failure 
PHP allows to override a method that returns non-reference with a method
that returns a reference. This mean that we cannot use prototypes to
predict return types of a child functions.
 2021-10-06 14:55:34 +03:00
Nikita Popov 3661c1932c Fix array cast type inference wrt packed arrays 
Use KEY_LONG instead of PACKED if it's possible for the array to
be empty. It won't be packed in that case.

Fixes oss-fuzz #39650.
 2021-10-06 10:50:44 +02:00
Nikita Popov f455894bb6 Don't start new block after loop free 
This reverts the change from 493c91c742.
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.
 2021-10-06 10:13:15 +02:00
Dmitry Stogov 41dc14792e Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed SSA construction
 2021-10-05 16:14:58 +03:00
Nikita Popov 20a784e026 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  POST_INC_OBJ/POST_DEC_OBJ don't have optional result
 2021-10-05 12:05:57 +02:00
Nikita Popov 493c91c742 Start new block after loop free 
In the attached test case we ended up not updating a leftover
MATCH jump in the unreachable_free block. There's different ways
this can be addressed, but in this case we can just make sure that
a new block is started after the loop free, which will allow it
to be dropped as unreachable. We only need to retain the free
itself for live-range reconstruction.

Fixes oss-fuzz #39516.
 2021-10-04 16:59:46 +02:00
Nikita Popov 5cdbfa897c Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix cache slot assignment for ASSIGN_OBJ_OP
 2021-09-30 14:34:50 +02:00
Nikita Popov 944d653b3d Fix inference for INIT_ARRAY with illegal offset type 
Extract assign_dim_array_result_type() helper that can be reused
for INIT_ARRAY and implements all this logic correctly.

Fixes oss-fuzz 5156868775870464.
 2021-09-29 11:09:04 +02:00
Nikita Popov 69eb6e04a7 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix ASSIGN_DIM result inference with typed refs
  Remove outdated code in ASSIGN_DIM type inference
 2021-09-28 14:14:29 +02:00
Nikita Popov 2b71df71a1 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix type inference and SCCP with typed references
 2021-09-28 12:59:24 +02:00
Nikita Popov 1e4a9a4999 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix block marking for two arm math
 2021-09-28 10:38:22 +02:00
Nikita Popov 0015fc9a8e Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix relative offsets when copying JMPZNZ
 2021-09-27 16:20:04 +02:00
Nikita Popov b86fdf84f0 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Start block at loop var free
 2021-09-27 11:58:53 +02:00
Nikita Popov b7ec15f7fe Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix DCE of unreachable phi in cycle
 2021-09-27 11:26:56 +02:00
Nikita Popov d5e80c1c0c Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Handle pi nodes in replace_predecessor
 2021-09-27 10:48:23 +02:00
Nikita Popov c9762be566 Don't treat expression exit as terminator 
Same as with throw expressions, this may remove later temporary
consuming instructions and thus eliminate live ranges, resulting
in a memory leak. We make use of the same hack and don't consider
exit a terminator if used in an expression context.
 2021-09-23 10:26:07 +02:00
Nikita Popov 2dc8c7b3a7 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix ASSIGN_STATIC_PROP_REF type inference
 2021-09-22 15:55:42 +02:00
Dmitry Stogov cffba945e5 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed type inference
 2021-09-22 15:32:16 +03:00
Nikita Popov a846547ed4 Fix range() return type inference for undef operand 
This results in a long range.
 2021-09-21 17:03:18 +02:00
Nikita Popov 37337507ec Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Don't unconditionally add array value type for undef
 2021-09-21 14:54:34 +02:00
Nikita Popov 55582a2527 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Don't replace values in unreachable code in sccp
 2021-09-20 13:12:43 +02:00
Nikita Popov bda1ee9511 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix FETCH_OBJ_IS type inference
 2021-09-17 17:05:42 +02:00
Nikita Popov e0e5b59d2e Try harder to clean up unreachable loop free block 
While we can't drop the loop free, we can drop other instructions
in the same block. We should also indicate that it no longer has
predecessors.
 2021-09-17 16:32:29 +02:00
Nikita Popov 3191f83146 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Don't const evaluate increment of array in SCCP
 2021-09-16 14:43:28 +02:00
Nikita Popov 91aa78f9b4 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix may_throw for ASSIGN_OBJ
 2021-09-16 12:47:04 +02:00
Nikita Popov ce105f655a Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Handle undef assignment to typed ref
 2021-09-15 10:58:41 +02:00
Nikita Popov 54bbee96ba Check for no uses before removing result operand 
It's possible for there to still be phi uses.
 2021-09-14 13:20:28 +02:00
Nikita Popov fa3d603ba2 Mark ASSIGN result as UNUSED in SCCP 
We can't drop the ASSIGN entirely, but we should mark the result
as UNUSED. Otherwise we'll replace uses of it in operands and
will not free the ASSIGN result value. This can happen with
non-interned strings, but possibly there's some other cases that
can trigger this as well.
 2021-09-14 13:16:51 +02:00
Nikita Popov a2fc14c14f Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix BIND_STATIC may_throw check
 2021-09-14 10:10:51 +02:00
Dmitry Stogov 6d1a2b3aed Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Properly check if BIND_STATIC may throw
 2021-09-13 21:59:47 +03:00
Nikita Popov 8c601edada Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  BIND_STATIC may throw
 2021-09-13 17:25:13 +02:00
Nikita Popov f6daf83e75 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Check that POST_INC/DEC has use in DFA optimization
 2021-09-09 15:50:04 +02:00
Máté Kocsis c8f858ef49 Add more specific array return type hints for various extensions - part 4 (#7469) 2021-09-06 17:14:52 +02:00
Máté Kocsis 6a47831e6e Add more specific array return type hints for various extensions - part 3 (#7467) 2021-09-06 12:27:28 +02:00
Nikita Popov 9b170a41a7 Mark private function as static 2021-08-31 14:54:02 +02:00
Máté Kocsis c19e4b9997 Generate optimizer func info from stubs for ext/standard - part 3 (#7426) 2021-08-30 15:56:47 +02:00
Máté Kocsis 1bf1481a2a Specify a few array func info entries (#7425) 2021-08-30 14:29:18 +02:00
Máté Kocsis 8e6e9838b0 Add support for generating MAY_BE_ARRAY_OF_REF func info flag (#7416) 2021-08-30 13:50:34 +02:00
Nikita Popov fab1222128 Ensure stub files are processed in predictable order 
The zend_func_infos.h file was generated in a different order for
me.
 2021-08-30 10:28:22 +02:00
Nikita Popov 0f7e0cf34b str_replace() can return the original string 2021-08-30 10:23:09 +02:00
Máté Kocsis b49d340f74 Generate optimizer func info from stubs for ext/standard - part 2 (#7414) 2021-08-27 16:54:04 +02:00
Máté Kocsis 3f0b586338 Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix a few func info
 2021-08-27 16:48:06 +02:00
Nikita Popov 51a504c8be Avoid string copy in get_cfg_var() 
basic_functions.c already has a macro for returning an ini
value to userland, so make use of it for get_cfg_var() as well,
after generalizing it to not write to return_value in particular.
 2021-08-27 15:34:46 +02:00
Máté Kocsis 1ce81b6bcd Generate optimizer func info from stubs for ext/standard - part 1 (#7413) 2021-08-27 13:11:57 +02:00