php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 23:48:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
126,612 Commits 549 Branches 1,485 Tags
56430ef6676f13b2a50f8947fd7800a4c2848b39
Commit Graph

182 Commits

Author SHA1 Message Date
Dmitry Stogov 8862e23098 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix reference contig inference
 2021-12-28 10:00:14 +03:00
Dmitry Stogov b2939b636d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix memory leak in SCCP
 2021-12-24 13:10:58 +03:00
Dmitry Stogov ca3f7b0a73 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix incorrect optimization of ASSIGN_OP that may lead to memory leak
 2021-12-20 15:17:30 +03:00
Dmitry Stogov c8d10a8243 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix type inference for INIT_ARRAY with invalid index
 2021-12-20 11:46:36 +03:00
Dmitry Stogov f8f0a650a7 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix incorrect optimization that leads to memory leak
 2021-12-13 13:09:05 +03:00
Christoph M. Becker a708db9c8a Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-7759: Incorrect return types for hash() and hash_hmac()
 2021-12-12 15:47:19 +01:00
Dmitry Stogov cfcee97ad6 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Remove range inference for booleans.
 2021-12-10 14:33:36 +03:00
Dmitry Stogov 363434bab2 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix incorrect JMP optimization
 2021-12-10 01:44:55 +03:00
Nikita Popov cf377eefa6 Don't convert assign op operand types in opcache 
This is the same change as 56b18d478e
but for ASSIGN_OP. Changing the operand type may change the error
message and can result in different behavior with operator overloading.

As with the other patch, if there is strong interest this could be
added to the DFA pass instead, with an appropriate type check.
 2021-12-06 21:56:04 +01:00
Dmitry Stogov 572c09d373 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed incorrect DCE of a constructor call
 2021-12-06 16:00:30 +03:00
Dmitry Stogov 4ed10f3d47 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix refcount inferemce ($a += $a returns old array with RCN)
 2021-12-06 11:31:51 +03:00
Dmitry Stogov c3766c08f4 Fix SCDF cleanup of unused basic block, kept only because of FREE of a loop var 
Fixes oss-fuzz #41516
 2021-12-01 18:03:08 +03:00
Dmitry Stogov 3564001502 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Fix incorrect reference counting inference
 2021-11-30 13:00:04 +03:00
Dmitry Stogov 2d3ea98624 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed type inference (it's safe to ignore reference counting narrowing)
 2021-11-29 23:39:37 +03:00
Dmitry Stogov 23c5a6fd16 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Fix exception handling when next array element is already occupied
 2021-11-29 21:57:29 +03:00
Dmitry Stogov c6e895aec2 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Disable type narrowing optimization when we contruct SSA for JIT
 2021-11-29 15:53:16 +03:00
Dmitry Stogov b1a1ed380f Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed incorrect narrowing to double
 2021-11-25 15:15:01 +03:00
Dmitry Stogov ecc4d1326b Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed incorrect refcountion inference for BW_NOT
 2021-11-25 13:53:26 +03:00
Dmitry Stogov 97f0c0b189 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed incorrect DCE for ADD_ARRAY_ELEMENT instruction
 2021-11-25 13:35:54 +03:00
Nikita Popov 51ae5c5397 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix bug #81652
 2021-11-24 15:19:33 +01:00
Máté Kocsis 20fb26e55c Add more specific array return type hints for various extensions - part 2 
ext/ftp, ext/gmp, ext/intl

Closes GH-7433
 2021-11-17 10:56:27 +01:00
Dmitry Stogov f313b65acb Optimize closures nested in other closures 2021-11-15 13:32:42 +03:00
Dmitry Stogov fb582f4230 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Fixed reference-counting inference
 2021-11-15 10:40:35 +03:00
Dmitry Stogov 9bd490dc33 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed incorrect reference counter inference
 2021-11-08 20:54:45 +03:00
Nikita Popov e5c2ad45dd Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Drop pi nodes for both old/new pred in replace_predecessor
 2021-11-08 14:57:16 +01:00
Máté Kocsis d02b9b953d Add more specific array return type hints for various extensions - part 1 
ext/bz2, ext/calendar, ext/dba, ext/enchant

Closes GH-7432
 2021-11-07 08:46:25 +01:00
Dmitry Stogov 22a171a0b5 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed type inference for FETCH_DIM_W without use
 2021-11-03 19:45:30 +03:00
Dmitry Stogov d4a7e4d1ff Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed incorrect assumption about reference counting
 2021-11-01 20:28:33 +03:00
Nikita Popov a89546d8b3 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Handle FETCH_DIM_R after FETCH_DIM_FUNC_ARG in inference
 2021-11-01 14:27:14 +01:00
Nikita Popov 3d38960979 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix range inference hang
 2021-11-01 12:32:04 +01:00
Nikita Popov 64878757be Fix scdf loop var free check for phi vars 
The variable may come from a phi node, in which case we should
take the defining block from it.

Fixes oss-fuzz #40453.
 2021-11-01 11:03:17 +01:00
Nikita Popov 1f19401ffa 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.
 2021-10-19 15:19:02 +02:00
Dmitry Stogov bdebefaa61 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed incorrect optimization that may cause JIT assertion
 2021-10-18 23:20:53 +03:00
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